[gmx-developers] Unsquashed MR in master

Magnus Lundborg magnus.lundborg at scilifelab.se
Tue Oct 5 18:57:11 CEST 2021

Hi everyone,

By mistake I merged an MR without squashing all commits today. The 
question now is if we should try to restore the master branch and 
rewrite the history or if we should let it be. Leaving it as it is might 
cause trouble with future 'git bisect' since some commits in between 
might not compile or might fail tests. But on the other hand, rewriting 
history is not optimal either, especially since there is at least one 
commit merged afterwards. I think it could be good not to merge anything 
more until we have decided how to proceed. What do you think would be best?

I'm sorry about this mess.


More information about the gromacs.org_gmx-developers mailing list