Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GitHub workflow merge master into feature #705

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+5 −0
Open

Fix GitHub workflow merge master into feature #705

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1a50280
Add workflow to merge master into feature
Feb 22, 2025
30cf112
Set fetch-depth: 0
dippeal Feb 23, 2025
dc073db
Remove git fetch
dippeal Feb 23, 2025
8dc9cd9
Reorder merge abort and remove success step
Feb 23, 2025
1080fca
Merge branch 'openjverein:master' into github-workflow-merge-master-i…
dippeal Feb 24, 2025
6560617
Fix exit code 128
Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/merge-master-into-feature.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
git reset --hard HEAD
continue-on-error: true

- name: Abort previous merge check
run: |
git merge --abort
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oben kann das Reset dann doch weg?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Soweit ich weiß, ist der reset schon notwendig.

git reset --hard HEAD
- name: Merge master into feature-3.1.0
run: |
# Merge master branch into feature with feature as king (ours)
Expand Down