How to Switch Branches After Making Changes with Git

Git version 2.13 introduced the new verb 'git switch' to make things more consistent with 'pop' and add more options to the creation command. This change can be useful, but it also introduces another point where you might take a break, come back, and do the wrong thing.

When creating a new stash using 'git stash save', this is the old verb for creating a new stash. I recommend separating the apply, inspect results, and drop steps to ensure that you are satisfied with the outcome before proceeding. If the application results in a mess, you can't easily get the stash back, so it's essential to be cautious.

Many users prefer 'git stash pop', which is short for 'git stash apply' and 'git stash drop'. Before assuming that the stash has applied cleanly, inspect the results carefully, as Git might not detect any merge conflicts. This means you can still encounter 'merge conflicts' if you accidentally switch branches.

The 'apply' step merges the stashed changes using Git's powerful underlying merge machinery, similar to when you do branch merges. However, this step deletes the reference to the weird non-branch-y commits, and once you have committed your code, these commits are safely stored in the repository.

To switch branches after making changes, follow these steps:

1. Commit your code: $ git commit -m 'commit message'

2. Switch branches: $ git checkout develop

3. Apply the stash: $ git stash apply

4. Inspect the results: $ git stash status

5. Drop the stash (if you're satisfied): $ git stash drop

If you encounter issues, you can try running 'git stash save' or 'git stash push' to resolve any conflicts.

In summary, switching branches after making changes with Git requires careful consideration and attention to detail. By following these steps, you can ensure that your changes are safely stored in the repository and applied to the correct branch.

Git switch branch after making changes