- Left pane (.LOCAL) is the incoming from the SVN "trunk".
- Middle pane is what we want it to be in the end.
- Right pane (.REMOTE) is the local GIT branch (that is being rebased).
There are simply some things with GIT (and GIT SVN) I don't use often enough to always remember how I want to go about doing something. As a result, this is going to be my GIT cheat sheet (a running list of notes) that I will update as I go along (or need to).
When I perform a GIT rebase and there are conflicts, the difftool will launch (for me that is Meld), displaying a 3-way difference. The middle pane is always easy to remember what it is, but the left and right panes I find myself confused. The panes are as follows:
Creating a single difference patch between two tags (tag1 and tag2) where multiple commits exist:
Realize, this will produce a patch that will turn tag1 into tag2, flipping them in the command would produce a reverse patch.
“Live as if you were to die tomorrow. Learn as if you were to live forever.”