Closed
Description
While promoting the v16.17.0 release today, I checked the diff after cherry-picking the release commit to main
(to verify I resolved the conflicts correctly) and found out that the cherry-pick can end up modifying the wrong lines!
It happened in test.md
and I think there are two causes:
added:
sections always consist of the same 5 identical lines- More APIs were added to the documentation between me updating the staging branch and the release being promoted.
What happened is that the cherry-pick modified added:
lines that are not in a v18.x release yet (so no conflict was generated).
I don't know if we can do something about it at the Git level to avoid the mistake.
Metadata
Metadata
Assignees
Labels
No labels