<div dir="ltr">Hi,<div><br></div><div>I think it's clear to follow normal practice and not rewrite history. Doing so means we have to rename master, delete it, push a fixed one, organize to replace the updated content, and then fix/delete the repo of anybody who's pulled in the meantime, including projects that automatically mirror us (including our own mirror on github). That's a small amount of activity for some people. Doing nothing means that there's a chance in future of someone doing a bisection and hitting one of these 24 commits that might not build or might fail a test. If they do, most of the time they'll see that the failure mode is different and they can move to a different nearby commit and try again. This is already what they would have to do if the case they're investigated was something that only failed in post-submit testing or the pre-submit testing that is not a formal requirement for gitlab to permit an MR to be submitted.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, 5 Oct 2021 at 18:57, Magnus Lundborg <<a href="mailto:magnus.lundborg@scilifelab.se">magnus.lundborg@scilifelab.se</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi everyone,<br>
<br>
By mistake I merged an MR without squashing all commits today. The <br>
question now is if we should try to restore the master branch and <br>
rewrite the history or if we should let it be. Leaving it as it is might <br>
cause trouble with future 'git bisect' since some commits in between <br>
might not compile or might fail tests. But on the other hand, rewriting <br>
history is not optimal either, especially since there is at least one <br>
commit merged afterwards. I think it could be good not to merge anything <br>
more until we have decided how to proceed. What do you think would be best?<br>
<br>
I'm sorry about this mess.<br>
<br>
Regards,<br>
Magnus<br>
<br>
-- <br>
Gromacs Developers mailing list<br>
<br>
* Please search the archive at <a href="http://www.gromacs.org/Support/Mailing_Lists/GMX-developers_List" rel="noreferrer" target="_blank">http://www.gromacs.org/Support/Mailing_Lists/GMX-developers_List</a> before posting!<br>
<br>
* Can't post? Read <a href="http://www.gromacs.org/Support/Mailing_Lists" rel="noreferrer" target="_blank">http://www.gromacs.org/Support/Mailing_Lists</a><br>
<br>
* For (un)subscribe requests visit<br>
<a href="https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers" rel="noreferrer" target="_blank">https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers</a> or send a mail to <a href="mailto:gmx-developers-request@gromacs.org" target="_blank">gmx-developers-request@gromacs.org</a>.<br>
</blockquote></div>