Brian Inglis writes: > Thanks - I'll try to remember to try that - on a pull conflict I > normally try to checkout -- file(s), then -f, then origin/master, then > plus -f, with status checks between, then commit -m merge when > required, and re-pull origin/master to check resynced to upstream > remote.
git status That usually tells you what it is that prevents pulling. Aside from that, you can always do git remote update to get the objects and then figure out how to pull the branch. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra
