Sourcetree creates 1KB BASE file while merging and merging is hence not possible. Command git merge-base commit1 commit2 returns the base commit that is of correct size (over 100 MB).
What to do to be able to merge, hence access the base file ? Does this have something to do with LFS ?
thank you for your reply! It might indeed. However:
with this configuration for merge
local: 127 MB
remote: 110 MB
base: 109 MB are created
and with this configuration for merge
local: 127 MB
remote: 138 MB
a 1KB base file (practically empty file) is created. I find yet no way which commit is git taking as base in a specific merge session. Apparently it cannot retrieve the base in latter case correctly. Do you have an idea ?
Further, 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. For the cases with 1 KB BASE file, to find which base, I executed git merge-base commit1 commit2. The resulting commit is a normal file, non empty.
I have this issue with 1KB retrieved BASE file, since a short time (Monday). 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