Martin Langhoff wrote:
My style has always be to use tags for merges; tag the origin branch as
well as before and after on the receiving branch.
Do you move the tags with cvs tag -F? If that's the case, the data you
need to merge is lost... otherwise, you could hack an alternative
merge detection based on your tagnames.
No, there are three tags:
before-merge-foo
| after-merge-foo
| |
branch 1 ---*--*----
/
/
branch 2 ---*-------
|
merge-point-foo
That's why I was a bit confused. I thought most people did something
similar.
-hpa
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
