On Wed, Feb 1, 2012 at 9:36 PM, Terry Brown <[email protected]> wrote: > On Wed, 1 Feb 2012 19:29:30 -0500 > Brian Theado <[email protected]> wrote:
> One scenario which might explain what happened would be Edward merging > your changes *from* the trunk *into his branch*, then trying to push > the result. By default that would work, but it would make your changes > a sub-commit of Edward's commit, which makes the trunk history hard to > follow. Here is my workflow. I have two copies of the trunk: one called "trunk" and the other called "main-trunk". I do my work in "trunk" and resolve conflicts in "main-trunk". To resolve a conflict, I pull the latest code into main-trunk, merge trunk into main-trunk, then push. I can foresee no way that Brian's commit could have caused problems. Instead, I continue to think that there was something wrong with either my "trunk" branch or my "main-trunk" branch. Edward -- 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.
