Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
sentrivana committed Dec 18, 2024
1 parent 7008b43 commit 72466e7
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ You might be tempted to branch off the feature branch and do the merge there, ma

## How to sync so that merge conflicts are recognized as resolved

…but you still get to see the nice GH diff and have CI run on your merge…
If you still want the nice GH diff and have CI run on your changes:

- check out the feature branch and `git merge master` into it
- solve conflicts (while still on the feature branch)
- commit the merge (still on the feature branch)
- *(if youre already confident all is good, you can just short circuit and push now, otherwise:)*
- *(if you're already confident all is good, you can just short circuit and push now, otherwise:)*
- then open a new branch from your feature branch `git checkout -b sync-feature-with-master`
- push the new branch, make a PR, look at the nice diff in GitHub, see if the tests pass
- if everything looks ok: dont merge the PR! this will not mark the merge conflicts as solved
- if everything looks ok: don't merge the PR! this will not mark the merge conflicts as solved
- instead, `git checkout` your feature branch (with the merge commit on top) and `push` it

0 comments on commit 72466e7

Please sign in to comment.