PlaceholderGames / 2021-yr2-group-4

CS2S561 2020/1 Group 4
0 stars 0 forks source link

Orphaned branch master #14

Closed DoctorMikeReddy closed 3 years ago

DoctorMikeReddy commented 3 years ago

Someone has created an orphaned branch, called master, using Sourcetree, it appears. I sent out a message a while ago, warning that the default branch is now called main. Using convenient gui based git clients, rarely does anything other than make extra work for everyone, and can break repos. Please use Git Bash, unless you are prepared to fix the repo yourself. I have had to spend several hours this week with third years, who didn’t take the time to learn the command line version of git, which neatly resulted with them missing a coursework deadline.

DoctorMikeReddy commented 3 years ago

444ADE37-C99A-483A-A826-CFC4355FE4FA

DoctorMikeReddy commented 3 years ago

Also, please create an issue and assign me in future, if you have problems. Reserve direct emails for real emergencies

DoctorMikeReddy commented 3 years ago

For context:

From: "Rozalen D (FCES)" 30011062@students.southwales.ac.uk Date: 7 November 2020 at 08:58:43 GMT To: Mike Reddy Mike.Reddy@southwales.ac.uk Subject: Git push Error Hi Mike, I'm having a mistake that I can't fix at push in git bash, it tells me that it fails to push some refs. I keep trying different solutions that I see but I also don't want to modify anything that could affect the project, what do you think could be the solution?

Cheers Dario F2359F60-1C36-40D2-9818-0E89FCA8360B

It was right of him to ask. I just should have been here, not an email. @DynomicAngel Ryan seems to have created this branch; I suspect not realising the default branch is main on GitHub now, maybe following an outdated tutorial? Rather than delete this branch - never remove evidence of your work - I’ve advised @30011062 Dario to do the following: Save a backup of the work you’ve done. Clone a new copy of the repo. Checkout main. Create and checkout a branch. Put your changes into that copy. Add, commit and push to that branch. Carry on working on that branch, merging into main when you are finished; ask how, please, if you don’t know.

DynomicAngel commented 3 years ago

branches fixed