Differences between revisions 5 and 6
Revision 5 as of 2010-11-29 20:05:46
Size: 1553
Comment: Added ohloh.net link
Revision 6 as of 2010-11-29 21:33:01
Size: 1550
Deletions are marked like this. Additions are marked like this.
Line 10: Line 10:
'''This extension is/is not distributed with Mercurial.''' '''This extension is not distributed with Mercurial.'''


This extension builds on the RebaseExtension but adds some simple logic that chooses a merge instead of a rebase if there are conflicts.

1. Status

This extension is not distributed with Mercurial.

Author: MarcusLindblom

2. Overview

The extension provides both a new command rebaseif as well as a new option to pull --rebaseif that invoke the rebaseif procedure after pulling. (Similar to RebaseExtension 's --rebase option).

This is useful since manual merges are error prone and a merge commit more clearly expresses each side of the merge, and the merge resolution choices, than a rebase (which tends to bundle all the local changes and the merge ops together and giving little chance of a rollback.)

The background for this is described in this StackOverflow question.

3. Configuration

Configure your .hgrc to enable the extension by adding following lines:

rebaseif = path/to/rebaseif.py

4. Usage

> hg rebaseif

> hg pull --rebaseif

5. See also


RebaseIfExtension (last edited 2012-02-15 22:36:20 by ks3095497)