Page History

...

If the work is primarily that of a contributor, use their name in the "Author" metadata.  If you can't because you don't have their email address, then mention them in the message.

Linear History in Git

[PENDING DISCUSSION]

We prefer linear history in our source control (Git) for ease of comprehension.  Assuming you think your change shouldn't be an exception, then ensure your commit is added on top instead of creating a loop.

Git: Rebase vs Merge

Please set: git config --global pull.rebase true
Consequently, pushing your changes will result in your changes being moved (rebased) on top of the latest changes to the branch you push to instead of a merge commit. This keeps the history linear which is nice for simplicity sake in the vast majority of cases. However, if there are non-trivial conflicts to resolve, then abort and merge into the upstream branch instead, which generates a merge commitTODO add tip on how to do this.