[gmx-developers] Git master broken

[David van der Spoel]

Hi,

it seems that git master is broken. Try the following:

mkdir koko
cd koko/
git clone git at git.gromacs.org:gromacs
git checkout -t origin/release-4-5-patches
git merge release-4-5-patches
less include/resall.h
<<<<<<< HEAD
t_restp *search_rtp(const char *key,int nrtp,t_restp rtp[]);
/* Search for an entry in the rtp database */
=======
char *search_rtp(const char *key,int nrtp,t_restp rtp[]);
/* Search for an entry in the rtp database, returns the rtp residue name.
  * A mismatch of one character is allowed, if there is only one nearly
  * matching entry in the database, a warning will be generated.
  */

t_restp *get_restp(const char *rtpname,int nrtp,t_restp rtp[]);
/* Return the entry in the rtp database with rtp name rtpname.
  * Generates a fatal error when rtpname is not found.
  */
 >>>>>>> release-4-5-patches

And a few more conflicts.

Any clue how to fix this?


-- 
David van der Spoel, Ph.D., Professor of Biology
Dept. of Cell & Molec. Biol., Uppsala University.
Box 596, 75124 Uppsala, Sweden. Phone:	+46184714205.
spoel at xray.bmc.uu.se    http://folding.bmc.uu.se