Ade Attwood 7c184d8616 feat: ask to remove branch in git-merge-patch ... When trying to merge-patch it will fail if the branch you are trying to merge is already on the local machine. This will ask if you want to remove it. The branch will be removed locally and then pulled from the remote to ensure you are not merging any un-pushed local changes.		2022-03-13 20:33:15 +00:00
..
files	feat: ask to remove branch in git-merge-patch	2022-03-13 20:33:15 +00:00
lib	refactor(core): start to make dotfiles public	2020-09-20 06:22:17 +01:00
manifests	style: align puppet array items	2022-02-19 14:43:29 +00:00
templates	refactor(git): update conflict style and set default branch	2022-02-15 20:40:56 +00:00