Hello everyone,
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?
Thanks
Qin
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Mon Feb 27 2012 - 12:00:03 PST
