Terminology for referring to branches during merges and conflicts

Martin Pool mbp at canonical.com
Fri Jan 15 01:23:00 GMT 2010


2010/1/15 Ben Finney <ben+bazaar at benfinney.id.au>:
>> Then there is keep/take or just take or even nothing:
>>
>> 1) --keep-this/--take-other,
>> 2) --take-this/--take-other
>> 3) --this, --other
>
> You've lost me with this part. Is there some particular command you're
> positing options for?

bzr resolve (which I think is where this thread started), in
particular when we're giving people command-line noninteractive ways
to resolve a conflict.  For instance if you had a directory deleted by
the merged-in branch and modified in yours, you could say 'bzr resolve
--this' to keep it or 'bzr resolve --other' to accept the deletion.
(Whether options to resolve are the best way to express that is a
somewhat separate question from how they are named.)

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list