AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Dotfiles/site-modules/core/files/bin
History
Ade Attwood f386272007 feat(bin): detect merge conflicts in merge-patch 
When merge patching it will now detect if there is an unresolved conflict in
your current branch and exit without doing anything.

This is useful when merging multiple branches at once, if you hit a conflict
half way though it would remove the "MERGE_PATCH" file and lose where you where
in the patch

Now the script will exit and not lose the position so you can `--continue`
correctly after fixing the conflicts
2022-02-15 20:24:45 +00:00
..
a2changedocumentroot refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
base16_theme refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
git-merge-patch feat(bin): detect merge conflicts in merge-patch 2022-02-15 20:24:45 +00:00
git-merge-to feat(git): update merge-to to rebase onto target branch 2021-03-16 20:18:15 +00:00
git-server-tag refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
kdeclipboard refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
knock refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
tmux-gendev refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
ubuntu.startup refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00
update-sys refactor(core): start to make dotfiles public 2020-09-20 06:22:17 +01:00