Other recommendations
In this section, you will find the best practices and recommendations that do not fit cleanly into one of the areas described so far, namely starting a project, working on a project, and integrating changes.
Don’t panic, recovery is almost always possible
As long as you have committed your work and stored your changes in the repository, it will not be lost. It could only perhaps be misplaced. Git also tries to preserve your current uncommitted (unsaved) work, but it cannot distinguish for example between the accidental and the conscious removal of all the changes to the working directory with git reset --hard
. Therefore, make sure to commit or stash your current work before trying to recover lost commits.
Thanks to the reflog (both for the specific branch and for the HEAD
ref), it is easy to undo most operations. Then, there is the list of stashed changes (see Chapter 3, Managing Your Worktrees), where your changes might be hiding. And there is...