No, that's not what I meant. A "fixup commit" is a commit that's added to a
pull request that fixes problems with code introduced in the same pull request.
>From CONTRIBUTING.md (emphasis added)
> 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.
In this PR, the first commit includes:
```diff
+ rescue ActiveRecord::RecordNotUnique
+ head :conflict
```
The third commit includes
```diff
rescue ActiveRecord::RecordNotUnique
- head :conflict
+ report_error "You are already subscribed to note #{note_id}.", :conflict
```
Since the `head :conflict` is added and then removed, the PR should be rebased
so that that code isn't mentioned in the history (for example, when using `git
blame`.
--
Reply to this email directly or view it on GitHub:
https://github.com/openstreetmap/openstreetmap-website/pull/5314#issuecomment-2489151008
You are receiving this because you are subscribed to this thread.
Message ID:
<openstreetmap/openstreetmap-website/pull/5314/[email protected]>_______________________________________________
rails-dev mailing list
[email protected]
https://lists.openstreetmap.org/listinfo/rails-dev
