Re: Best tool for "selective merge"?
Re: Best tool for "selective merge"?
- Subject: Re: Best tool for "selective merge"?
- From: Jens Alfke <email@hidden>
- Date: Thu, 02 Jul 2015 17:14:16 -0700
On Jul 2, 2015, at 5:06 PM, Tim Carpenter < email@hidden> wrote:
Nothing beats getting to understand git directly. What you are suggesting should be a basic git task.
But performing complicated merges (where you select individual lines or hunks to commit) on the command-line is a total pain in the butt. I’d no more do that than I’d edit my files on a teletype.
—Jens |
_______________________________________________
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