Edward K. Ream wrote: merging A into B >> is *not* the same as merging B into A. Unless there are conflicts, >> merging A into B replaces B's code with A's code. > > On second thought, this statement, if it is true at all, probably only > applies to criss-cross merges.
As I understand version control merges, they are line by line, and you need to add the intelligence to stop partial changes to modules, where you would prefer a new module replace an old module... So making a test merge is good, and also learning how to undo a merge, and mostly making frequent logically consistent commits, so you can merge just a commit at a time and it's not overwhelming to see it all. --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
