4 ms·
In my experience it's all fine and dandy until you hit a rebase or merge that needs manual attention.
by nicky0 10y ago
In my experience it's all fine and dandy until you hit a rebase or merge that needs manual attention.
- apk17 10y agoIn mine, not quite. All forms of merges are simple: resolve, add, commit. Inside a rebase I find it harder to memorize whether I need to to the add and/or commit or rebase --continue does it for me. And conflicts from 'stash pop' are somewhat counterintuitive to handle.