I'm on a Mac (OS X 10.9.2) using SourceTree 1.8.1. I make my initial local commits using Eclipse 3.8.2 with the Eclipse EGit plugin. Then I push those upstream using SourceTree.
I have several repos that, even though I am the only developer working on them, almost every time I go to push my commit changes upstream, SourceTree tells me that I have 1 new commit to pull first. Why does that happen?
When I do the pull, it almost always says "Already up to date. Merge completed by recursive strategy."
On a similar vein, if I have a file that I make edits to AND rename the file, all before committing the file, the same thing happens (1 new commit to pull), except I almost always get a merge conflict. In this case, it seems like Git or ST get confused, and try to make me pull down the "missing" file, that I am about to delete/rename with my next commit. I usually just "resolve the conflict using Mine", commit the change, then I can push my changes.
Could I be doing something better to avoid these issues? And I'd really like to know where / why the mystery pull happens for just a set of changes.
I haven't tried via the command line. Since my team added Sourcetree to the mix I haven't used the shell much. I can try the next time I havw ths case and see what happens. Could you speculate either way? I assume the same will happen.
We push to a BitBucket account.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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