Re: [AMBER-Developers] Problem in merging lyx files

From: Qin Cai <>
Date: Tue, 28 Feb 2012 11:30:22 -0800

Thank you for your suggestions, Dave. Perhaps I should be working on the master branch, as far as the revision on the manual is concerned.

On Feb 27, 2012, at 6:23 PM, case wrote:

> On Mon, Feb 27, 2012, Qin Cai wrote:
>> <<<<<<< HEAD
>> interactions is also implemented in
>> \shape italic
>> pbsa
>> \shape default
>> .
>> =======
>> interactions is also implemented in this release.
>>>>>>>>> d3115272d27f1fc82946543205120a18c3ccd249
> If you type "git log", which is the first commit you see? i.e. your current
> HEAD? Commit d3115272d27f1f was made last Friday, and both you and Ray are
> listed as having made a number of commits to the manual since then. Have you
> been using different computers? Another possibility is that you (or Ray, or
> someone else) made some changes while you were on the pbsa-dev branch, and
> other changes while you were on the master branch. That could also cause
> conflicts upon a merge.
> The conflicts you mention look legitimate: two people have been editing
> the pbsa parts of the manual independently, and making conflicting
> changes. This could be you on different computers (or different
> branches), or you and Ray, or something else. I'm guessing you either
> have to go ahead and resolve the conflicts, or move your version to a new
> name, do a "git pull" then look for diffs and manually update the version
> in git to be what you really want.
> We're having a flurry of changes as the deadline approaches, so people should
> pull from git all the time, to minimize divergence of your local trees from
> those in San Diego.
> Maybe someone on the list sees something I'm missing.
> ....dac
> _______________________________________________
> AMBER-Developers mailing list

AMBER-Developers mailing list
Received on Tue Feb 28 2012 - 12:00:02 PST
Custom Search