Re: [AMBER-Developers] AmberTools12.lyx broken?

From: David A Case <>
Date: Fri, 22 Mar 2013 22:39:01 -0400

On Sat, Mar 23, 2013, Benjamin D Madej wrote:
> Is it safe to edit the AmberTools12.lyx file from the current
> version? I'd like to make a few last minute changes to a section I added
> a few weeks ago.

Please realize that notions like the "current version" are not useful in a
situation where the file is changing hourly.

You can work from commit 4823946ec1b61f5009. Please work carefully, and do a
"git diff" before pushing any commits, to make sure that the changes in the
file are the ones you want to make.

If git reports conflicts, they can be very hard to resolve manually (since
the lyx format has many repeated lines that tend to fool the automatic
merging). If you get conflicts, you often will need to get a clean version,
and re-introduce your changes.

[As I mentioned, going forward we will split the manual into separate files
for each chapter, which should greatly reduce these problems.]


AMBER-Developers mailing list
Received on Fri Mar 22 2013 - 20:00:06 PDT
Custom Search