Handle submodule conflicts#996

lucasderraugh merged 1 commit into

git-up:mastergit-up/GitUp:masterfrom

lapfelix:submodule-conflictslapfelix/GitUp:submodule-conflictsCopy head branch name to clipboard