On Thu, Oct 28, 2010 at 8:20 PM, john skaller <skal...@users.sourceforge.net> wrote: > > It is working now, although I lost the whole mornings work because > I ended up deleting everything and trying to start again, > I committed stuff but didn't push it so that got lost when I deleted felix :)
There are some things that git can help you with that. Rather than just deleting all of felix, you can do: % git clean -xfd And it will delete all of the uncommitted files. Or, you could do: % git reset --hard And it'll reset all your files to the last commit you made. You can also do "git reset --hard $SHA1" to reset your branch onto another commit point. Another thing you could do is throw your temporary changes in another branch with: % git checkout -b temp % git commit -a % git checkout master Then you can always refer back to those changes if you want. Or even better in some circumstances is using: % git stash Which automatically throws your modifications into a temp branch, and then a later: % git stash pop Will take that change and merge it with whatever commit you're on. It's pretty helpful if you have some code you're playing around with, but someone else pushed a commit you want. In that case, I usually do: % git stash % git pull % git stash pop ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Felix-language mailing list Felix-language@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/felix-language
