Avoid adding changes from dev to your commits, especially if they won't cause a merge conflict. If you need to update the branch to dev for any reason in simple cases like this use `git rebase dev` while having your branch checked out.