Tip to avoid "dirty commits" When you create a new branch, instead of doing
git checkout develop
git checkout -b [branch-name]
do
git checkout -b [branch-name] origin/develop
When you merge new changes into your branch from develop, instead of doing
git checkout develop
git pull
git checkout [branch-name]
git merge develop
do
git checkout [branch-name]
git merge origin develop