When merging operation is called, temporary files are created in the project folder that was checked out such as BASE, LOCAL, REMOTE and BACKUP.
How to find out which commits SourceTree takes exactly for Base, Local, Remote and Backup ?
And welcome to the Atlassian Community.
BASE is the common ancestor before there where any changes to the file on either side.
LOCAL is your side of the conflict, e.i. your changes made to the file.
REMOTE is "theirs" side of the conflict, e.i. changes made on the branch you are merging from.
BACKUP is what the file looked like before you invoked the merge tool.
You can find out the base commit by using git merge-base and feed it with the commit on your branch and the commit on the branch you are merging to.
Mikael, thank you. The command does really return a commit, however, when I merge I get a 1KB base file which is practically empty and the returned commit is not empty, it is a file over 100 MB big. I have this related question. So I was wondering, if there is a way to get the base commit in a current merge operation beyond the one returned by the command or why does merge retrieve an empty base, although the returned base by the command is a "big" file ?
The point is it is not always the case that in the merge process a 1KB BASE file is created. For merge with some other branches it works fine as usual. I have this issue since a short time (Monday). Further, I tried to merge using git merge <sourcebranch> command and git mergetool command to merge and resolve conflicts, all without Sourcetree involved. Still the same problem.
A vulnerability has been published today in regards to Sourcetree for Windows. The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event