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

Fetch some more history to be able to merge #36

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Fetch some more history to be able to merge #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d204ff
Fetch some more history to be able to merge
MonsieurBon Nov 29, 2024
3d87589
Revert to git checkout, as git switch is still experimental
MonsieurBon Nov 29, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:

- name: Merge back to develop
run: |
git fetch --depth 2 origin develop
git fetch --depth 10 origin develop
git checkout develop
git fetch --shallow-since="$(git show -s --format=%ci develop~1)" origin master develop
git fetch --shallow-since="$(git show -s --format=%ci develop~2)" origin master develop
MonsieurBon marked this conversation as resolved.
Show resolved Hide resolved
git merge master --no-edit
git push origin develop