Re: [gemoc-dev] potential pb on github/gemoc/gemoc-studio-eclipsefork

[Erwan Bousse <erwan.bousse@xxxxxxx>]

Hi,

I think we have no choice, you have to "push --force" and make both
repos share the exact same list of commits once again. 

If in the meantime someone pulled the bad commits, then these persons
should simply reset their local repo to an older commit, and pull
again. Or more simply, they can clone a brand new local repo. Hopefully
no one is in the case and no one will notice this ever happened.

Yes it would be great to have a bot that syncs the eclipsefork repos
master branches automatically. And we could forbid everyone to push to
master (except for the bot).

Erwan


Le vendredi 19 octobre 2018 à 11:11 +0200, Didier Vojtisek a écrit :
> Hi
> 
> I may have done a mistake when I tried to synchronize 
> eclipse/gemoc-studio (master) with gemoc/gemoc-studio-eclipsefork 
> (master) (cf. one of my preious message)
> 
> 
> apparently it created 2 commits (66c6c27 and 3315c24) whereas I was 
> expecting to simply replicate eclipse/gemoc-studio history in the
> fork
> 
> this is strange because, actually there is no differences (in term
> of 
> files differences)
> 
> This may lead to difficulties when trying to do more synchronization
> and 
> crafting pull request
> 
> however, as this is online I don't known how to cleanly fix the 
> history...  (I may do --force on gemoc/gemoc-studio-eclipsefork but
> it 
> may break people git repo ? or I may create a dummy pull request on 
> eclipse/gemoc-studio but this will create "ugly" commit on the
> official 
> repo...)
> 
> If anyone has a suggestion ...
> 
> we definively also need a clean procedure to synchronize these repo
> 
> Didier
> 
-- 
Erwan Bousse
Associate Professor, Université de Nantes
NaoMod research
group, LS2N research laboratory