Normal
Owlsroostwhat have you done with your branch? ;-) I wanted to merge it again into my local branch but it totally breaks my branchProblem is this one:"commit dc29fef0c739315f87e1dd6196ccce1242ac8a1cMerge: 6b19eaf b016657Author: owlsroost <tony@owlsroost.org.uk>Date: Fri Mar 2 23:26:00 2012 +0000: After merge and revert.....aagh"could you please do a hard reset and then a non forward push or something like that?
Owlsroost
what have you done with your branch? ;-) I wanted to merge it again into my local branch but it totally breaks my branch
Problem is this one:
"
commit dc29fef0c739315f87e1dd6196ccce1242ac8a1c
Merge: 6b19eaf b016657
Author: owlsroost <tony@owlsroost.org.uk>
Date: Fri Mar 2 23:26:00 2012 +0000
:
After merge and revert.....aagh
could you please do a hard reset and then a non forward push or something like that?