David Chanters <david.chant...@googlemail.com> writes: > 2. At this point I scan the two branches looking for a point to > graft; I might have done this already in the past, but the point is > since grafting is a local operation and I am not working in that > repository, I might need to do it again anyway -- that graft > represents a way of tieing the branches together at a point I can then > "git merge".
You can "git merge -s ours" that grafting point, assuming "portable" completely subsumes "bsd" at that point. Future merges should then be working normally. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
