4 Jun
2014
4 Jun
'14
9:35 p.m.
On 4 June 2014 22:08, Vicente J. Botet Escriba
I don't know why there are merge issues, as I didn't changed anything in this repository :(
Then the best thing is probably just to run 'git reset --hard' in the predef directory to undo the changes. My guess is that you had the old branch converted from subversion and ran 'git pull' and it tried to merge them both. That kind of problem can happen when there's a discontinuous history, which shouldn't happen again.