Jm tips

git flight rules is a great idea! Here's a few more git scenarios and solutions.


the much easy way, just ```git reset --hard origin/bug24``` and you've got the same as one the server