I keep getting nightmare rebases and I think its because Im taking the wrong steps.
I\'ve got 3 branches ... mainbranch, branch1, branch2 ... branch1 is a branch off