A tale of user-friendliness with "hg merge" and "hg rollback".

[Yann E. MORIN]

Hello Rob!
All,

On Monday 12 October 2009 22:06:29 Rob Landley wrote:
> What possible use could an "uncommitted merge" have?

Fixing merge conflicts? ;-)

No matter how smart a merge heuristic could be, it can be nowhere as
smart a human brain is. Solving merge conflicts implies a human doing
the nit-picking of what's going in, what's not going in, and what needs
to be changed/fixed before it goes in.

Or so I think, and I'm ready to be proven wrong...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
`------------------------------^-------^------------------^--------------------'