[GiNaC-devel] (git) spurious merges

Jens Vollinga jensv at nikhef.nl
Tue Apr 1 10:27:55 CEST 2008


Dear all,

Alexei Sheplyakov schrieb:
> These merges 
> 
> 83a7ee99a947cbbf331018b803ad6be43a9ccd45
> eb9e62507fb1d2a0d5ddfdfcc2977a57ce40ca21
> 357698c2ef153870a31d33a9b53a5a01d582f942
> 
> look really strange (as in "this should not happen"). What's going on?

I've no idea. When I pushed something into git Richy had already done 
some changes there (and vice versa), so I had to pull first. I don't 
know why this merge was not fast-forward. We had an issue with the 
directory permissions (sharedRepository was not set to group), maybe 
this is the reason?

Regards,
Jens



More information about the GiNaC-devel mailing list