Wolfgang Walther c77cfb9239 workflows: run on merge conflicts as well ... When a PR is having conflicts with the base branch, we used to skip most jobs depending on the target branch. With this change, we still run those jobs, but without actually merging the PR temporarily. That means we compare the head of the PR with the merge-base of the PR's branch and the target branch - i.e. the point where the PR branched off. This is not 100% accurate, but that's not important, because after resolving the merge conflicts, those workflows will run again anyway. It allows to give early feedback, though, instead of just skipping all the jobs.		2025-05-23 23:06:18 +02:00
..
ISSUE_TEMPLATE	ISSUE_TEMPLATE: Create option for packages without a Hydra build status (#400751)	2025-05-02 23:42:21 +02:00
workflows	workflows: run on merge conflicts as well	2025-05-23 23:06:18 +02:00
dependabot.yml	.github/dependabot.yml: disable default labels	2025-05-05 17:15:19 +02:00
ISSUE_TEMPLATE.md	ISSUE_TEMPLATE.md: clear the blank issue template	2025-01-12 16:01:56 -03:00
labeler-development-branches.yml	workflows/labeler: fix repo owner condition	2025-05-04 18:52:43 +02:00
labeler-no-sync.yml	labels: Automatically label CI changes for backport to 25.05	2025-05-16 20:53:25 +02:00
labeler.yml	labels: no CI label for OWNERS changes	2025-05-11 12:20:07 +02:00
PULL_REQUEST_TEMPLATE.md	25.11 is Xantusia	2025-05-16 19:21:55 +02:00
STALE-BOT.md	.github/stale bot: stop commenting	2022-04-30 08:30:08 -07:00
stale.yml	.github/stale bot: stop commenting	2022-04-30 08:30:08 -07:00