'bitbucket log lost on main after merge
We have done some "not by the book" merging and cherry-pinking between main branch and a release branch, but the release branch grew a lot more than we expected. Not very professional, but that's the way life is sometimes.
When merging the release branch back to the main branch, we got a lot of conflicts (>300). On some type of files we selected the contents of the release branch knowing that all work should have been done in the release branch. But it turned out that some of the files should have been picked from the main branch instead.
The problem now is that all history of those files are lost in the main branch. I have tried bitbucket web interface, tortoisegit and normal terminal git.
I can find the history in tortoisegit by selecting "First Parent" in "Walk Behavior", using this method I managed to revert the merge on the affected files. But the main issue remains, that the log of my changes in the main branch is lost unless I know that I should look for them.
Is there a way to get the log history back?
I believe that the reason to how this could happen is described in this thread: Github history of master lost after merging branch but I'm not sure if I understand the workaround, so I hope to get some new advice in this thread.
Sources
This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.
Source: Stack Overflow
| Solution | Source |
|---|