Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch Management #28

Closed
vidalt opened this issue Jun 3, 2022 · 1 comment
Closed

Branch Management #28

vidalt opened this issue Jun 3, 2022 · 1 comment

Comments

@vidalt
Copy link
Owner

vidalt commented Jun 3, 2022

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

@vidalt
Copy link
Owner Author

vidalt commented Jan 4, 2023

Closing this issue now

@vidalt vidalt closed this as completed Jan 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant