Brian Inglis writes: > It's normally a merge conflict which will not be satisfied by regular > commands to restore the working files to upstream.
So you're pulling on an unclean work tree? That's a no-no, either keep your changes on a separate branch (that you can rebase or merge later) or stash them away for the pull. As Corinna said, if you're prepared to lose any local changes then git reset --hard will do that. But you should be sure you really didn't want any of your unfinished business around any more. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
