Differences between revisions 1 and 3 (spanning 2 versions)
⇤ ← Revision 1 as of 2010-11-27 02:07:30 →
Size: 1205
Editor: MarcusLindblom
Comment:
← Revision 3 as of 2010-11-27 15:53:49 → ⇥
Size: 1190
Editor: abuehl
Comment: fix cat
Deletions are marked like this. Additions are marked like this.
Line 2: Line 2:
= Extension Name = = RebaseIfExtension =
Line 38: Line 38:
CategoryExtension CategoryExtensionsByOthers CategoryExtensionsByOthers

RebaseIfExtension

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

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.

Contents

  1. Status
  2. Overview
  3. Configuration
  4. See also

1. Status

This extension is/is not distributed with Mercurial.

Author: MarcusLindblom

Download site: https://bitbucket.org/marcusl/ml-hgext/src/tip/rebaseif.py

Issue tracker: https://bitbucket.org/marcusl/ml-hgext/issues

2. Overview

3. Configuration

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

[extensions]
rebaseif = path/to/rebaseif.py

4. See also

CategoryExtensionsByOthers

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