search

ryu-001 / pracweek4

0 stars 3 forks source link

main and master branches #5

Closed hptf62 closed 2 years ago

hptf62 commented 2 years ago

are we using the main branch or the master branch? My repo automatically pushes to master, is there a way to merge the two branches together?

ryu-001 commented 2 years ago

I've renamed the original master branch to main, maybe someone pushed a master branch later. I'll try merge them together.

ryu-001 commented 2 years ago

https://www.theserverside.com/blog/Coffee-Talk-Java-News-Stories-and-Opinions/rename-Git-branch-local-remote-GitHub-GitLab-BitBucket#:~:text=The%20steps%20to%20change%20a,name%20from%20your%20remote%20repo

This was the method I used during the practical to rename my 'master' branch to 'main', could you try it on your local repo and see if it works?

hptf62 commented 2 years ago

its not working, its always going back to master, I'm going to just delete my fork and make a new one from main

ryu-001 commented 2 years ago

alright, please tell me how it goes

hptf62 commented 2 years ago

That seems to have done the job