commit 3ba7ede51c17a78050d29a22a42fc83d5840b137 parent bd43c3ef6d3613427c8852b81993db0106a46448 Author: Ondrej Grover <ondrej.grover@gmail.com> Date: Tue, 10 Jun 2014 09:26:04 +0200 recommend --preserve-merges git opt for rebase to minimize rebase conflicts Diffstat:
| M | dwm.suckless.org/customisation/patches_in_git.md | | | 11 | +++++++---- |
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dwm.suckless.org/customisation/patches_in_git.md b/dwm.suckless.org/customisation/patches_in_git.md @@ -77,11 +77,14 @@ branch Then rebase your customization branch on top of the master branch git checkout my_dwm - git rebase master + git rebase --preserve-merges master -In case there are merge conflicts resolve them (possibly with the help -of `git mergetool`), then record them as resolved and let the rebase -continue +The `--preserve-merges` option ensures that you don't have to resolve +conflicts which you have already resolved while performing merges again. + +In case there are merge conflicts anyway, resolve them (possibly with +the help of `git mergetool`), then record them as resolved and let the +rebase continue git add resolved_file.ext git rebase --continue