New to SourceTree and GIT branching...
We have a git repro where all the main development happens along the master trunk, but some time ago a separate branch was created for some experimental work. I'm now trying to merge that branch back into master with SourceTree but having a major problem where all the files that have been added to master since the other branch was created (and don't exist in that branch) are being flagged as deleted from master.
Here's what I'm doing
The result is a bunch of conflicts as expected, but also a mass of "deleted" files that really should not be!
What's going on??
I think you can avoid that issue by following practice:
before you merge the branch into the master, you go to your branch and pull from the master (applying the latest changes, new files etc). Then you resolve conflicts on your branch, then you merge to the master.
Even if your branch has a wired past, it will then know what the master should be and just apply the current differences, instead of wired past differences.
what you need to do is a simple merge from your branch to master. no need to select a commit.
This is what I do.
checkout master branch in sourcetree.
right click on your other branch (on left tree) and select "merge branch into current branch" . current branch is master .
and it should merge all changes from other to master.
Ok I've found out a bit more - there was a merge of the master into the branch at one point in the past, but shortly after that a revert to a commit before the merge (don't ask me why). Selecting this revert shows all the files that we new in the master as to be deleted in the branch.
Any attempt to merge the branch into master after this point causes the master files to be deleted.
How do I get out of this mess?
There was a commit (some changes) then a merge with master, then the commit was reverted, which also removed all of the files added by the merge because it happened after the commit that was being reverted. As well as removing new files, this revert also undoes the changes in master that had happened up to the point of the revert.
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