Request for rebaseif extension to be provided by default with rebase

Pierre-Yves David pierre-yves.david at logilab.fr
Tue Jun 21 04:54:11 CDT 2011


On Tue, Jun 21, 2011 at 11:45:11AM +0200, Sébastien Deleuze wrote:
> Is there a better way that could allow hg pull to print me if there is
> conflicts or not between my local and the remote changes when pulling them ?

As said in a previous email, real world conflict can't be detected by a computer.

Rebase should never be used blindy.

-- 
Pierre-Yves
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20110621/ee5a3119/attachment.pgp>


More information about the Mercurial mailing list