When hitting a conflict with no changes you can `--skip` just like you would if you where rebaseing and running `rebase --skip` |
||
|---|---|---|
| .. | ||
| a2changedocumentroot | ||
| base16_theme | ||
| git-merge-patch | ||
| git-merge-to | ||
| git-server-tag | ||
| kdeclipboard | ||
| knock | ||
| tmux-gendev | ||
| ubuntu.startup | ||
| update-sys | ||