On 10/17/05, Kevin Geiss <[EMAIL PROTECTED]> wrote: > cool. it just occurred to me though that I asked the wrong question > though. the 2 branches I'm thinking of are nearly exactly the same. > the difference is that each branch has a patch or 2 which the other > branch doesn't want. so most patches need to merge unchanged from one > branch to the other, but in each branch I need to skip a couple > patches from the other branch permanently. it equates to a few files > here and there which are mostly the same, but have a few lines > different between branches. is that easy to do also?
Yes, definitely. Git *will* try and merge them for you if you call cg-merge, but you can edit the tree before the commit action, so you just undo the hunks you don't want, and commit. GIT will then consider that your "merge resolution", mark those commits as done, and go on with life. cheers, martin
_______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
