Subtree merge conflicts using SourceTree

Hi,

we're using the Sourcetree software for Windows to manage a number of git repositories. We have a number of libraries, where each library is a single git repository, and a number of projects, which contain the libraries as subtrees.

If a new commit is made in one of the projects and pushed to a subtree, the pull of the same subtree in another project generates some merge conflicts, even if the library hasn't been touched in the second project. The merge only shows new lines in the remote part, the local part is clean. So in fact, there is no real merge conflict.

I read about some problems within the subtree command (see this thread: http://stackoverflow.com/questions/17242063/git-subtree-conflict-when-pulling-from-central-repo), but the fixes mentioned there are either not working ("fetch fix") or undesired ("pull after push-fix").

Is there a proper way to deal with this problem?

Thanks for any help!

1 answer

Hi,

This is quite an old issue and still a valid one. Is there any view on how to tacke this? Can there be an option to allow 'pull' be done automatically after a 'push' ?

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

841 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you