Re: resolving import conflicts

[email protected] (Larry McVoy) Wed, 26 Apr 2006 13:53:36 -0700

Newsgroups	gmane.comp.version-control.bitkeeper.user
Message-ID	<[email protected]>

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