Re: Why is examining changes during Merge so hard?
Re: Why is examining changes during Merge so hard?
- Subject: Re: Why is examining changes during Merge so hard?
- From: Scott Ribe <email@hidden>
- Date: Sun, 09 Nov 2014 07:41:06 -0700
On Nov 8, 2014, at 9:41 PM, Jerry Krinock <email@hidden> wrote:
>
> Is there an easier way to do this, or do we all do steps (1) - (3), or is my workflow wrong?
Your workflow is completely reasonable. I use SourceTree, and it makes that easy, since it displays changes inline, old code red, new code green, with a button to discard a change (I think, not that I really use that).
--
Scott Ribe
email@hidden
http://www.elevated-dev.com/
(303) 722-0567 voice
_______________________________________________
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