Re: Best tool for "selective merge"?
Re: Best tool for "selective merge"?
- Subject: Re: Best tool for "selective merge"?
- From: Tim Carpenter <email@hidden>
- Date: Fri, 03 Jul 2015 08:45:06 +0800
- Thread-topic: Re: Best tool for "selective merge"?
Hi,
In this case, your description spoke of one bug fix in master you want merged into version2, with, I am presuming here, version2 being a superset of master except that big fix?
If so, a simple git merge should do it. Any conflicts can be inspected in-line.
For more complex merges, git is still very good at it, and much can he done with sensible use of branches, which are fast and cheap in git.
Tim
Sent from TypeMail
On 3 Jul 2015, at 08:14, Jens Alfke <
email@hidden> wrote:
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.
Learning the command-line git tools is very worthwhile.
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