Title: RE: Help! Implementing Bi-Directional Merges
Eric:
It may occasionally be useful to do this to recover from an
unusual situation, but as an ongoing part of your development
process, it'd be extremely dangerous!
Thanks for pointing out what I missed - that prior to replacing HEAD
[ On Monday, October 15, 2001 at 10:52:57 (-0700), Nesbitt, Steve wrote: ]
Subject: Help! Implementing Bi-Directional Merges
Another way to phrase the question is How do I force the tip of one branch
to be identical to the tip of another branch?
Check out the source and target branches in
Title: RE: Help! Implementing Bi-Directional Merges
Greg:
Thanks for the heads up on the html (I love Microsoft - give me back my linux box!)
The question I have with this approach is what does my diff look like afterwards? For example, if my base version is 1.3 and I copy the entire file
[ On Monday, October 15, 2001 at 12:03:11 (-0700), Nesbitt, Steve wrote: ]
Subject: RE: Help! Implementing Bi-Directional Merges
Thanks for the heads up on the html (I love Microsoft - give me back my
linux box!)
Hah! :-) So, why don't you just take it back? Nobody _needs_ M$.
Use of M
On Mon, Oct 15, 2001 at 10:52:57AM -0700, Nesbitt, Steve wrote:
Base question is how can I successfully implement a bi-directional merge
between two branches when the merge to one branch must be deferred?
Another way to phrase the question is How do I force the tip of one branch
to be
