[Act] repo out of sync for tpc-2017-amsterdam (rather urgent...)

[Detlev Hauschildt]

Thanks a bundle Sébastien, Laurent and Tina for your quick intervention!

Our repo is back in sync now.

'git pull' indeed does a merge, that much is clear from 'man git-pull'.

I'll tell the other contributors not to move the branch head around for 
now, just to be safe, but I guess with Tina's suggestion it wouldn't be 
a problem.

Cheers,

Detlev


On 2017-06-05 22:58, Sébastien Aperghis-Tramoni wrote:
> Tina Müller wrote:
>
>> On Mon, 5 Jun 2017, Sébastien Aperghis-Tramoni wrote:
>>
>>> Actually, the repositories on the Act server are directly updated
>>> from GitHub, with no intermediate repository, using git pull:
>>>   » https://github.com/book/Act/blob/master/bin/gitupdate
>>>
>>> Maybe git pull isn't the correct way to update a repository?
>> It should be enough if nobody ever uses a forced push.
>> To deal with that, you could do the following:
>>
>>       git fetch
>>       git reset --hard origin/master # or production, ...
>>
>> Or, you could protect those branches on github, so people cannot
>> do a forced push.
> No need to annoy the few people who still use Act with that. I'll
> go with your solution of fetch/reset. Thanks!
>