Re: Applying changes in diff view?
Re: Applying changes in diff view?
- Subject: Re: Applying changes in diff view?
- From: Fritz Anderson <email@hidden>
- Date: Thu, 01 Oct 2015 12:59:14 -0500
On 30 Sep 2015, at 7:48 PM, Rick Mann <email@hidden> wrote:
>
> When using Xcode 7.0.1 to diff between git branches, is there a way to take each diff in turn and selectively apply it (or ignore it) from the right pane to the left?
I assume you’re talking about the Versions layout (third item in the editor-layout segment control).
1. The classic way (Xcode ~3.2) is copy-and-paste. Still works, and it’s the only way to handle less than a full chunk. Obviously you can’t go left-to-right, because the right-hand pane is a display of a committed version, not an editor.
2. 7.0.1 (and quite a bit earlier) puts a drop-down menu on the lozenge in the gutter, “Discard Change.” Moving the old (right-hand) code into the left is the same as rejecting the “change.” (My possibly-sloppy experiment shows that if the changes came in separate branches, the option is still there, so it’s not a change but a diff’ed chunk.)
Up- and down- arrow rotates among them.
Less likely, you mean the comparison sheet for a commit. There’s a prominent button on each chunk to put the change off until a later commit, and a dropdown command to abandon it entirely.
Not likely your meaning at all, for non-conflict lines in a merge, there’s a toggle in the ribbon between the chunks. Set it so your local version (left) wins, or the arriving remote one wins (right). In the case of a conflict, select the chunk, then use the control at the bottom to choose left-wins/right-wins/left-then-right/right-then-left.
— F
_______________________________________________
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