[Angstrom-devel] slightly OT - request for help with 3-way merges in OE
joshua at willowisp.net
Tue Nov 20 19:46:49 CET 2007
I have been running into my own ignorance WRT 3-way merges - I seem to be
incapable of getting them to work. I would be more than happy to lose my
local edits on an update, but if I delete (usually move, as it's safer) my
file, mtn complains about a missing file.
Is there a way to force overwrite from the repository to my local copy?
I have googled and looked at the mtn man page, but I am not seeing anything
that would help.
I appreciate any pointers.
More information about the Angstrom-distro-devel