Re: Best tool for "selective merge"?
Re: Best tool for "selective merge"?
- Subject: Re: Best tool for "selective merge"?
- From: Alex Zavatone <email@hidden>
- Date: Thu, 02 Jul 2015 23:18:50 -0400
I ran into horrendous crashes in Xcode 6.2 with conflict resolution in merges in Git.
It would crash after completing conflict resolution in one 4000 line class and then when I clicked the next class, insta crash with some dictionary reference.
Upgrading to Xcode 6.3 solved that.
On Jul 2, 2015, at 2:11 PM, Jerry Krinock wrote:
> Real life is messy. I have a master, currently-shipping branch, and a version2 branch. I fixed a messy bug on the master, and, of course, now want my bug fix merged into version2. Comparing master and version2, there are a couple hundred “hunks”, I think they are called (groups of changed lines), in 75 or so files. About half of them involve the bug fix that I need merged into version2, and the other half are enhancements that, of course, should remain in version2. I actually went through and made a rough list of the line numbers and a few words to describe each “hunk” in the bug fix.
>
> The next step is to do the actual merge. What is the best tool to do this?
>
> Actually, Xcode 6/7 has quite a nice interface for this, if it wouldn’t crash. But, in my experience with Xcode 6, it often does, sometimes after I have spent an hour or more getting all of the little left/right selectors positioned properly :(( It’s a huge project with hundreds of big files.
>
> I have also been advised to try Atlassian’s SourceTree. I have it open now. It has quite a complicated interface and I would need to study it quite a bit and ask some questions in their forum. The last time I tried SourceTree, I got unexpected results and had to use Time Machine :( Also, I like the side-by-side diff display in Xcode better than red/green above/below display in SourceTree.
>
> I’d appreciate any advice before I take the deep dive. Is Xcode 7 more stable in this situation than 6 was? (Yes, I have filed bugs.) Or is there another tool that is better for doing a large “selective merge"? I could spend some money on it :)
>
>
> _______________________________________________
> Do not post admin requests to the list. They will be ignored.
> Xcode-users mailing list (email@hidden)
> Help/Unsubscribe/Update your Subscription:
>
> This email sent to email@hidden
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden