...
It’s good practice to develop off branches and merge those changes into the main/develop branch (typically called known as trunk - main/develop).
Merging changes into main
Because we are not working with a remote git repo, we can merge changes from one branch into the current using git merge
...
It’s good practice to delete the branch once the feature is complete. Let’s go ahead and delete the branch feature/rev_will_not_be_televised
Merge conflicts
If whilst you were making changes to your feature branch, someone changed the main branch, the main is considered to be ahead of the feature branch, this will cause a merge conflict.
...