[wiki] Best practice: How to update a commit that has not yet been merged

From: Max Schillinger <maxschillinger_AT_web.de>
Date: Sun, 11 Jul 2021 12:03:50 +0200

Hi all,

some days ago I committed a patch update to the sites repository.
Afterwards I noticed that I could have done better (it doesn't make
sense keeping both flextiles's `shiftmastersplit` and dwm's `incnmaster`
which didn't exist when flextile was written).

After my commit, other commits have been merged to the repository.

What should I do in such a situation?

- `git commit --amend` (or will this break the git history for other
users?),
- send a new commit based on my first commit,
- send a new commit that replaces my first commit (if yes, how to mark
the first commit as outdated?),
- wait until my first commit has been merged (or declined) and then send
a new commit based on the new HEAD?

Best regards,
Max
Received on Sun Jul 11 2021 - 12:03:50 CEST