merge when green annoyance

[e00E]

Not sure if or how we fix this but wanted to document the problem.

I have multiple PRs that are supposed to be merged in a row and depend on each other like branch-0, branch-1, branch-2 and there is only one commit in each branch. Then when I merge-when-green branch-0, branch-1 gets updated to point to master but it cannot be merged anymore because of a merge conflict. There is no real conflict because of the way the branches were set up but I think what happens is that the squash feature updates the commit timestamp and message which changes the hash so that the merged commit no longer matches the original branch-0 commit. The code change is the same but the commit hash changed which is a conflict. This is annoying because I have to checkout the branch locally again and rebase to master manually.

Does that happen to you too? Is there something I can change about the workflow to not have this problem?

[nlordell]

This happens to me as well. I also think that it is, as you pointed out, because the squash commit is treated as a different commit to the one in your base branch.

Maybe we can configure merge when green to fast-forward merge if the branch has exactly a single commit, or configure it to rebase instead of merge with master.

[fleupold]

Maybe what we want is this config from https://doc.mergify.io/merge-action.html#strict-merge

[fleupold]

There are a bunch of issues with it though, so I'm not sure we can use it https://doc.mergify.io/actions.html#strict-rebase