You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Question: is it true, that the Git-History of Branch main is rewritten frequently?
I come to this Question, because our Workflow is to take main and to add our Changes on top in a separate Branch, currently some 60 Commits.
To follow your proceeding Development we then regularly rebase our Branch against main. This used to work flawlessly.
But in recent Times – perhaps since one Year or so – this leads to Rebase-Conflicts, and further Investigation reveals, that the old main is not there anymore as it was.
Example: currently our Commits sit on Top of 0e725b4c, which was main's last Commit then in 2024-02, but today I find this very Commit in main with a different Commit-ID and the former Commit-ID is not existing anymore.
The most recent common Commit-ID between main and our Branch is identical to the former master from 2020. All later Commits have gotten new Commit-IDs. So the Rebase starts there which is annoying, because I have to handle Conflicts, which have nothing to do with my Work at all.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
Hello,
Question: is it true, that the Git-History of Branch
main
is rewritten frequently?I come to this Question, because our Workflow is to take
main
and to add our Changes on top in a separate Branch, currently some 60 Commits.To follow your proceeding Development we then regularly rebase our Branch against
main
. This used to work flawlessly.But in recent Times – perhaps since one Year or so – this leads to Rebase-Conflicts, and further Investigation reveals, that the old
main
is not there anymore as it was.Example: currently our Commits sit on Top of 0e725b4c, which was
main
's last Commit then in 2024-02, but today I find this very Commit inmain
with a different Commit-ID and the former Commit-ID is not existing anymore.The most recent common Commit-ID between
main
and our Branch is identical to the formermaster
from 2020. All later Commits have gotten new Commit-IDs. So the Rebase starts there which is annoying, because I have to handle Conflicts, which have nothing to do with my Work at all.Beta Was this translation helpful? Give feedback.
All reactions