[petsc-dev] Merge sets

[Satish Balay]

On Sat, 18 Feb 2012, Matthew Knepley wrote:

> I cannot identify the behavior from that description. However, I
> have been using it for almost a year now, and the nice thing is that
> if anything goes wrong (merges with MacHg can screw up badly), I
> just do
> 
>   hg rollback
>   hg revert --all

Just like merge, rebase also pops up the merge tool [if needed] - like
kdiff3 reducing the need for rollback/revert.

However in a rebase, there are as many merge operations as local
commits - so an equal number manual merges [with kdiff3] are
potentially possible.

Satish