How to make git rebase fail, if merge conflicts appear

Question

I'm currently writing trying to write a workflow, that rebases one branch onto another on each push. Now I want that action to fail, if any merge conflicts occur (as there is no way that my code would be able to resolve these).

Is there any flag or other way to make git rebase fail if merge conflicts appear? Can I reproduce this behaviour on another way?

How would I do this for git merge?

Thanks for the input, didn't think the exit code would change if promted to resolve merge conflicts. — Jojomatik, Mar 10 '22 at 18:37

score 3 · Accepted Answer · answered Mar 10 '22 at 20:27

3

Even though it's not obvious from the documentation most git commands fail with exit code 1.

This answer shows this behaviour for git merge, while this one assumes the same bahaviour for git rebase.

answered Mar 10 '22 at 20:27

Jojomatik

156
2
16

How to make git rebase fail, if merge conflicts appear

1 Answers1