Tips and Best Practices
Preview Pull Requests
Always use the "preview pull request" option before you create a pull request. This gives you a chance to check for conflicts before you create the pull request. While conflicts can be resolved after you create a pull request, it is much easier to resolve them before you create the pull request.
Use Descriptive Names
Make sure that you use descriptive names for both your branches and your commits. Simply saying "update" for a commit message makes it hard to go back and understand why the changes were made.
Use a Different Branch for Every New Feature
As much as possible, keep different feature developments separated on different branches. This allows you to merge one new feature while you are still working on another, instead of having them married together.
Keep Commits Small
Similar to keeping separate branches, make commits often. A commit should be made after each meaningful change to your codebase. Doing this makes it easy to go back and figure out what you changed, or even undo changes. If you introduce a bug, you want to be able to revert changes in a commit without affecting code that is unrelated to the bug.