Software tasks to do after merging our branches (Done)

A forum for discussion on the software for the WMT River Control System
hamishmb
Posts: 1891
Joined: 16/05/2017, 16:41

Re: Software tasks to do after merging our branches (Done)

Post by hamishmb »

Well, I'm glad I could accidentally help :lol:
Hamish
hamishmb
Posts: 1891
Joined: 16/05/2017, 16:41

Re: Software tasks to do after merging our branches (Done)

Post by hamishmb »

Fast-forward a bit and I still haven't made the master -> main default branch change.

However, all new gitlab repos now use main as the default branch, so I'm thinking I'll go ahead and do this. Are people happy for me to do this for all the repos? I guess I should get everyone to check they don't have any un-pushed changes for the master branch first.
Hamish
TerryJC
Posts: 2616
Joined: 16/05/2017, 17:17

Re: Software tasks to do after merging our branches (Done)

Post by TerryJC »

OK by me.
Terry
hamishmb
Posts: 1891
Joined: 16/05/2017, 16:41

Re: Software tasks to do after merging our branches (Done)

Post by hamishmb »

Okay. Waiting for Patrick to confirm.
Hamish
hamishmb
Posts: 1891
Joined: 16/05/2017, 16:41

Re: Software tasks to do after merging our branches (Done)

Post by hamishmb »

Patrick has confirmed, making the changes now.
Hamish
hamishmb
Posts: 1891
Joined: 16/05/2017, 16:41

Re: Software tasks to do after merging our branches (Done)

Post by hamishmb »

Okay, I have completed the process.

For your next pushes, either delete and re-clone your local repository, or run

Code: Select all

git branch -m master main
And then push to main as usual.
Hamish
Post Reply