[gmx-developers] Git master broken

[Rossen Apostolov]

  Hi David,

On 8/25/10 3:58 PM, David van der Spoel wrote:
> 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
When you checkout release-4-5-patches, you will be switched to it, so ...

> git merge release-4-5-patches
... what is the point of this merge? Is there a typo?

> 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?
>
>