Quantcast
Channel: Active questions tagged config - Stack Overflow
Viewing all articles
Browse latest Browse all 5054

Git rebase auto abort on conflict

$
0
0

I would like to configure git in a way to get the best of these both options, which are unfortunately mutually exclusive:

[pull]    ff = only    rebase = true

Basically, I want to automatically rebase when pulling, but if there are conflicts, the rebase should be aborted.
This way, if I update in the background, my repository always stays in a valid state.


Viewing all articles
Browse latest Browse all 5054

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>