When committing to a shared repository, use git rebase to re-commit your local work on top of other coders' commits, instead of creating a merge commit.
If you use Git from the command line, run git config --global pull.rebase true to make it the default for git pull.