my situation is commonly like this:
* clone openFrameworks or an ofxAddon
* make some local changes necessary for a project
* make some commits
* come back much later without touching that repo for a while, and want to pull upstream/master to get the latest version from the server
* get merge complaints
* know that its pragmatic / cleaner to abandon my old changes and just pull the community copy and make changes from there
* not be able to find any git command which will abandon all my local unstaged*+staged changes and pull hard from upstream master
* have to delete my forks on github, delete my local clones
* refork, reclone
(*getting rid of unstaged changes is the easy bit)
obviously this is ridiculous.
one alternative seems to be to immediately start my own local branch every time and make my changes there
is this the way to go?
The idea of spending a few hours picking through the merge seems much less effective than recoding as required (although keeping a copy of the old stuff would be great). Perhaps can move all my local commits into a branch, then pull on master?