Add alternative way to resolve merge conflicts#34

saschastahl wants to merge 1 commit into

lhcb:masterlhcb/second-analysis-steps:masterfrom

saschastahl:mastersaschastahl/second-analysis-steps:masterCopy head branch name to clipboard