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

making class_refactoing_pyside6 the new master branch #128

Open
andrea-bistacchi opened this issue Jan 15, 2025 · 0 comments
Open

making class_refactoing_pyside6 the new master branch #128

andrea-bistacchi opened this issue Jan 15, 2025 · 0 comments
Labels
enhancement New feature or request high priority Important fix/feature/issue

Comments

@andrea-bistacchi
Copy link
Collaborator

As you can see under Insights > Network, the branch called class_refactoring_pyside6 is the de facto master since many months. We need to make it the new master (and backup the old one) since this situation creates a lot of confusion.

Unfortunately we cannot safely merge it into master since we made some changes in master and we don't want to keep them.

Another fundamental requirement is that we want to keep the full history of what wee did on class_refactoring_pyside6 in these months.

After reading a lot of confusing material on stackoverflow, including what listed below for the record, I realized that what we probably need is to rename the branches on the remote GitHub repository as follows:

master -> old_master_backup

class_refactoring_pyside6 -> master

After this, everybody needs to delete their local PZero repositories (i.e. completely delete the local directory) and clone again a clean one.

It would be probably possible to use some other method to force this update, but in the end it will be more complex.

BEFORE DOING THIS, I need you to confirm that you have pushed to the remote all your local work and can delete your local copy. Then you please delete the local copy and wait for my OK to clone it again after I have completed the renaming.

BTW, if you have a better solution please share it with everybody.

The confusing "solutions" proposed on stackoverflow can be seen at the following pages:

https://stackoverflow.com/questions/2763006/make-the-current-git-branch-a-master-branch?answertab=createdasc#tab-top

https://stackoverflow.com/questions/2862590/how-to-replace-master-branch-in-git-entirely-from-another-branch

https://stackoverflow.com/questions/54087033/how-replace-a-branch-in-git-with-another-branch-without-merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request high priority Important fix/feature/issue
Projects
None yet
Development

No branches or pull requests

8 participants