One of the ways to avoid it is to review things you're going to merge. And one of the easiest ways to do it is to open a PR on github where you can clearly see which commits you're going to merge. I was similar errors multiple times when people do `git pull` instead of `git pull --rebase` and it was always easy to catch during PR review (even if you review your own PR by yourself).
Also just my opinion – you should never force push into public master branch. On Wed, Dec 21, 2016 at 11:44 AM, Marko Käning <mk-macpo...@posteo.net> wrote: > I agree with Mojca, it looks messy now! > We better fix it fast. > Someone with admin access to the repo should be able to fix this if we > don’t wait too long. > > I think we should somehow make sure that such merged branches cannot be > pushed to the main repo, if rebasing is our policy for all committers > anyway. -- With best regards, Ivan Larionov.
