how remerge works and when to use it?
Martin Pool
mbp at sourcefrog.net
Wed Aug 5 08:44:35 BST 2009
2009/8/5 Alexander Belchenko <bialix at ukr.net>:
> Hi,
>
> I wonder how remerge works and when it's make sense to use it?
> I'd like to know more than written in help for this command.
>
> Does this command uses THIS/OTHER/BASE files or starts merge for file from
> the beginning?
It starts from the beginning.
> Is it safe to run remerge several times for entire tree with
> different value of merge algorithm option?
Yes.
> What is reprocess actually and
> for which merge algorithms it is applicable?
What a great question. It reduces the number of conflicts, at some
risk that it won't conflict on things were it should. I'd have to
check the code...
--
Martin <http://launchpad.net/~mbp/>
More information about the bazaar
mailing list