Search code examples
gitrebasemeldmergetool

git rebase confilcts merge issues

I have 2 branches, for example branch A and B and enter the command

git rebase A B

Then conflicts occur and use 

git mergetool

and have meld for mergetool.

Now Meld opens with 3 panes, left, center and right. I don't exactly understand what is displayed in each pane. I have found similar resources but not for rebasing. And also after having finished with the merge what is my goal :

  1. To make the center pane as I want it now
  2. Too make the center pane as it should be if the commit was applied to the new branch A.
Solution

  • Left panel is the file as it is in branch A of your example
    Right panel is the file as it is in branch B of your example
    Central panel is "merge" result where you can choose, from left, right, or editing directly, what to keep.