Re: Best tool for "selective merge"?
Re: Best tool for "selective merge"?
- Subject: Re: Best tool for "selective merge"?
- From: Jonathan Mitchell <email@hidden>
- Date: Thu, 02 Jul 2015 20:12:45 +0100
> On 2 Jul 2015, at 19:11, Jerry Krinock <email@hidden> wrote:
>
>
> 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 would stick with SourceTree and get to learn the interface. I think it will repay the effort.
I use it on both OS X and Windows and it is stable and gets regular updates.
Getting unexpected results is, in my opinion, a common occurrence when doing a merge!
I tend to do my merges in disposable branches. If I mess the merge up I discard the branch. Otherwise I merge it back into master or wherever.
Large merges tend to fray the nerves!
My approach is to use an external merge tool with SourceTree - like you I prefer side to side diffs.
This lets me audit every change side by side - I always tend to screw up when doing a merge using ‘mine’ and ‘theirs’.
You can configure this under Preferences - Diff - External Diff Tool and External merge tool.
I use P4merge as it works okay and is cross platform.
You will have to install it separately to SourceTree.
Good luck
Jonathan
_______________________________________________
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