You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
If fetching upstream requires opening a pull request so that conflicts can be resolved, and such conflicts are resolved as follows, then a merge is completed without letting CI run.
This is a specific example of what Github recommends for resolving conflicts using command line.
git checkout -b mastodon-main main
git pull https://github.com/mastodon/mastodon.git main
git o mastodon-main
Then commit to finish merge... (don't do this)
git o main
git merge --no-ff mastodon-main
git push origin main
The text was updated successfully, but these errors were encountered:
The way to solve this is not to create the pull request initially. Instead, follow the same instructions as above except the second stanza should use an integration branch like upstream-integration instead of main. Then when that branch is pushed on the last line, it can be used to create a PR with no conflicts.
where X is an unused number. If the branch upstream-integration is deleted after push, and created from our main at the beginning, then there's no need to keep creating new upstream-integrationX branches.
If fetching upstream requires opening a pull request so that conflicts can be resolved, and such conflicts are resolved as follows, then a merge is completed without letting CI run.
This is a specific example of what Github recommends for resolving conflicts using command line.
Then commit to finish merge... (don't do this)
The text was updated successfully, but these errors were encountered: