On Mar 19, 2016, at 8:25 AM, Jerry Krinock wrote: > Yesterday I had a train wreck, possibly similar to one I had a few months > ago, after a huge merge which involved deleting a hundred or so files and > adding a couple humdred more. This happened when I was on my “feature” > branch and clicked in the Xcode menu: Source Control > Merge into branch… > > master. The result was that both branches looked like master, and the > “feature” branch had staged a big commit. > > So I trashed the local repository and re-cloned from the remote. This time I > switched to the master branch first and did Source Control > Merge from > branch > <feature>. Ant this time, it worked fine. > > The first time, I don’t know, maybe I switched branches too quickly, before > git was done manipulating all of those files, and Xcode stepped on itself > somehow. > > Just to preempt the discussion, yes I realize that there are other git client > apps, and yes I’ve tried them. And yes there is the git command line, and > yes I use that frequently, whenever Xcode’s Source Control gives me some kind > of crap, or for more complicated operations. But that Source Control menu is > so handy, I like to use it whenever possible. There is only one other person > on this team, so I usually don’t need to be a Git acrobat. > > Lessons learned, I’m assuming to be correct for now: > > • Do *not* use Merge into Branch…. > • *Do* switch to the destination branch, maybe wait several minutes, then > Merge from Branch….
The scary thing is this, "do you know why this matters?" If not, well, we have no idea why a 'merge to branch' merge broke and we have no idea why the 'merge from branch' merge worked. _______________________________________________ Do not post admin requests to the list. They will be ignored. Xcode-users mailing list (Xcode-users@lists.apple.com) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/xcode-users/archive%40mail-archive.com This email sent to arch...@mail-archive.com
