[openstreetmap/openstreetmap-website] Clarify fixup commits and branching guidelines (PR #6594)

[Pablo Brasero]

@pablobm commented on this pull request.

Thank you for this @aNsHuL5217. I have just a small nitpick.

> @@ -197,6 +197,7 @@ For simple commits the one line summary is often enough and the body of the comm
 If you have forked on GitHub then the best way to submit your patches is to push your changes back to GitHub and open a Pull Request on GitHub.
 
 If your pull request is small, for example one or two commits each containing only a few lines of code, then it is easy for the maintainers to review.
+Please ensure your commit history is clean. Avoid including "fixup" commits. If you have added a fixup commit (for example to fix a rubocop warning, or because you changed your own new code) please combine the fixup commit into the commit that introduced the problem. `git rebase -i` is very useful for this.

Two small edits here:
- Added an extra line break to separate it from the paragraph about "small" PRs.
- Linked the first two sentences with an "and", which I think flows better.

```suggestion

Please ensure your commit history is clean and avoid including "fixup" commits. If you have added a fixup commit (for example to fix a rubocop warning, or because you changed your own new code) please combine the fixup commit into the commit that introduced the problem. `git rebase -i` is very useful for this.
```

-- 
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/6594#pullrequestreview-3552640148
You are receiving this because you are subscribed to this thread.

Message ID: <openstreetmap/openstreetmap-website/pull/6594/review/3552640148 at github.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstreetmap.org/pipermail/rails-dev/attachments/20251208/95270b43/attachment.htm>