Git tips and tricks

This page is a place to collect things we found out how to do in git

Recover from doing work before creating a feature branch

1. Open git bash window
2. git stash
3. Usual process to create feature branch...checkout develop, rebase, start feature
4. git stash pop

Usually your changes are there. If someone else modified the same files you will need to merge.

Todo: describe that process.

Commit to a gerrit repo without using FW git gui tools

This is helpful if some non-flex repo is using git/gerrit, but the add-ons for git gui are not available.