
16 Jul
2014
16 Jul
'14
7:57 p.m.
Daniel James wrote:
Cherry picking should work. It's hard to tell what the issue with local changes is without seeing what they actually are.
I sometimes get inexplicable local changes when the branch has been force-pushed. git reset --hard origin/master fixes it (assuming git checkout master).