On Mar 19, 2016, at 5:25 AM, Jerry Krinock <je...@ieee.org> wrote:
>
> 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….
I’m somewhat surprised that Xcode offers a merge into option. The git command
git merge foo
will merge the foo branch into the HEAD (your current) branch. You have to
check out the destination branch first to make it HEAD. This is also the case
in the non-Xcode GUI tools I know.
Perhaps the answer to the “why this matters” is that Xcode is attempting at
doing something un-git like and getting it wrong.
Marc
_______________________________________________
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
