feat: configurable conflict resolver for rebase conflicts#146

abersnaze wants to merge 2 commits intomsiemens:mastermsiemens/PyGitUp:masterfrom

abersnaze:conflict-resolverabersnaze/PyGitUp:conflict-resolverCopy head branch name to clipboard