Am 29.10.25 um 11:35 schrieb Jean-Marc Lasgouttes:
Le 29/10/2025 à 09:54, Scott Kostyshak a écrit :
You would need to force push, since the log entry is part of the commit.
Every project has different policies about force push. My personal
opinion in this case would be to not force push. The mistake is fine. Or
if you want, you can write an *empty* follow-up commit, e.g., "git
commit --allow-empty" in which there is no diff but your message can say
"amend 735b747d" and you write your amended log entry. i.e., you are
amending the log entry (which is part of the commit).
The above is completely my personal opinion. I am not aware of what
official guides suggest in this case, or project policies.
I'm curious what others suggest.
My analysis is the same, one should not force push on our real branches.
I do that on my private ones.
+1. Force pushing on main ore stable branches creates lots of problems
for users who already got the old commit.
The common solution for maintaining a clean history on the main branch
is to enforce development in feature/development/whatevername branches
(which are allowed or even encouraged to rewrite history), and only
allow merging those branches into main.
For LyX I think the current branching model that allows direct pushes to
the main branch is OK. The (sometimes) unclean history is not a big problem.
Georg
--
lyx-devel mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-devel
