I'm getting some very uncomfortable merges due to using a combination of hg copy and hg rebase.
What seems to be happening is when I rebase, changes that were made to the file that was copied from (after the copy), are being now applied to the destination file when I rebase. Is there a way of stopping that from happening during a rebase or evolve? Thank you. -- This communication is confidential. We only send and receive email on the basis of the terms set out at www.taitcommunications.com/email_disclaimer <http://www.taitcommunications.com/email_disclaimer>
_______________________________________________ Mercurial mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/mercurial
