I think the problem is I cherry-pick Wes's commit from pbsa-dev in which the revisions were made to an old version of AmberTools12.lyx.
Now that we have rolled it back, let me ask Wes if he can make his revisions to the latest version of AmberTools12.lyx.
Qin
On Mar 22, 2013, at 7:49 PM, Daniel Roe wrote:
> Hi,
>
> For what it's worth, the manual seems OK now (as of 4583f5678f56...).
>
> -Dan
>
> On Fri, Mar 22, 2013 at 8:39 PM, David A Case <case.biomaps.rutgers.edu> wrote:
>> 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.]
>>
>> ...thx...dac
>>
>>
>> _______________________________________________
>> AMBER-Developers mailing list
>> AMBER-Developers.ambermd.org
>> http://lists.ambermd.org/mailman/listinfo/amber-developers
>
>
>
> --
> -------------------------
> Daniel R. Roe, PhD
> Department of Medicinal Chemistry
> University of Utah
> 30 South 2000 East, Room 201
> Salt Lake City, UT 84112-5820
> http://home.chpc.utah.edu/~cheatham/
> (801) 587-9652
> (801) 585-9119 (Fax)
>
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Mar 22 2013 - 20:30:06 PDT
