From 7aae27de034ce3eb765b4b63db415c92b4871d49 Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Fri, 22 Nov 2019 17:44:05 +0100 Subject: [PATCH] CONTRIBUTING.md: Add help for resolving a pull request --- CONTRIBUTING.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d88d6839b..8f5beb9d5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -354,6 +354,20 @@ makes it difficult for the reviewer to follow them. It might also happen that you introduce regression and won't be able to recover them from previous commits. +If you encounter a merge conflict you could either resolve it by hand with an +editor and use + + $ git add -p + +To add your changes or use a merge tool like [meld](https://meldmerge.org/) to +resolve your merge conflict. + + $ git mergetool + +After the merge conflict is resolved you can continue to rebase by using + + $ git rebase --continue + Once squashing is done, you will have to force push your branch to update the PR: