making class_refactoing_pyside6 the new master branch

[andrea-bistacchi]

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

[andrea-bistacchi]

Hi, this was solved very easily in three steps, that reflect the de facto situation.

1. rename branch class_refactoring_pyside6 as main using tools in the branch page.

2. make main the new default branch in the settings page. The name "main" is also compliant with new GitHub standards.

3. rename branch master as old_master, to make cleat that it is old, using tools in the branch page.

Regarding the local repository, I completely deleted it (deleted its directory) and cloned again a clean one (git clone https://github.com/gecos-lab/PZero). Maybe there are other options but this is easy and takes no time.