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.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events