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
The latest updates to the repository had been done over the dev branch but stashed+merged on the main branch. This had led to a different commit history on both branches, which is problematic for a long-lived branch such as dev. To correct this situation, I have made a copy of dev into dev-old to preserve access to un-stashed older commits, and resetted dev to the main branch head.
Therefore, before editing the code, make sure you have checked out the current state of the dev branch. Contact me if you encounter any issues. In the future, I will only register clean (aggregated commits) on the dev branch and directly merge them (without stash) into the main, so we will not encounter again this issue.
Kind Regards,
--Thibaut
The text was updated successfully, but these errors were encountered:
The latest updates to the repository had been done over the
dev
branch but stashed+merged on themain
branch. This had led to a different commit history on both branches, which is problematic for a long-lived branch such asdev
. To correct this situation, I have made a copy ofdev
intodev-old
to preserve access to un-stashed older commits, and resetteddev
to themain
branch head.Therefore, before editing the code, make sure you have checked out the current state of the
dev
branch. Contact me if you encounter any issues. In the future, I will only register clean (aggregated commits) on thedev
branch and directly merge them (without stash) into themain
, so we will not encounter again this issue.Kind Regards,
--Thibaut
The text was updated successfully, but these errors were encountered: