chore: remove stray git-stash leftovers, fix .gitignore conflict markers (fixes #1030)#1178

gHashTag merged 3 commits into

mastergHashTag/t27:masterfrom

fix/ci-stash-cleanup-1030gHashTag/t27:fix/ci-stash-cleanup-1030Copy head branch name to clipboard