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

From: David A Case <>
Date: Mon, 27 Feb 2012 15:20:51 -0500

On Mon, Feb 27, 2012, Qin Cai wrote:
> I'm struggling to merge my revision of the manual with others' although
> they are definitely in different chapters. Each time I git pull I have
> to resolve tens of conflicts by hand. Is there an easier way to do it?

Are you talking about conflicts just in the AmberTools12.lyx file?

What version of LyX are you using? It should be 2.0.x. If it's an earlier
version, that could be a cause of this sort of problem.

Can you describe one or two of the conflicts? Maybe that would help pinpoint
the problem. I do push and pull from the git repo all the time, and have made
lots of changes to the AmberTools12.lyx file, and don't ever remember having
seen a conflict.


AMBER-Developers mailing list
Received on Mon Feb 27 2012 - 12:30:01 PST
Custom Search