[Bitkeeper-users] resolving import conflicts

Larry McVoy lm at bitmover.com
Wed Apr 26 13:53:36 PDT 2006


Try 

	bk patch -p1 -g1 < patch

which will leave the rejects in your repo and you can fix them up by hand.

> I have a patch file, created with bk export, that I'd like to apply to 
> another repository.  However the patch can't be applied to a couple 
> files because of a conflict.
-- 
---
Larry McVoy                lm at bitmover.com           http://www.bitkeeper.com


More information about the Bitkeeper-users mailing list