Best practices for merging

[Kevin Bullock]

On May 26, 2011, at 12:39 PM, Harvey Chapman wrote:

> On May 26, 2011, at 1:30 PM, Kevin Bullock wrote:
> 
>> On May 26, 2011, at 12:18 PM, Peter Bourgon wrote:
>> 
>>> The transplant extension allows you to "copy" a committed changeset
>>> from one branch to another in this way.
>> 
>> ...but is totally unnecessary. Seriously, just merge. This is what merging is for. This ain't Subversion. Merge.
> 
> Isn't transplant more suited for when you incorrectly fix a bug in the middle of a feature branch and therefore can't safely merge?


Yes, but there's also other ways to do that.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock