git-it-electron icon indicating copy to clipboard operation
git-it-electron copied to clipboard

Branch master is not used anymore by GitHub

Open buondevid opened this issue 5 years ago • 11 comments

First of all, well done it's a great app!

Anyway in the "Remote control" challenge, it requires to create the remote repository using master branch, but GitHub has replaced it with main now, so I wasn't able to accomplish it!

Keep up the great work

buondevid avatar Dec 13 '20 05:12 buondevid

@jlord would you be open to this change? To change all references to master to main instead?

It may require some additional setup on some people's machines (to default in Git to main instead of master) - eg. git config --global init.defaultBranch main as in our System Setup Guide for our bootcamp.

karlhorky avatar Jan 08 '21 10:01 karlhorky

Hi! I am definitely open to this change, if someone can get to it and make a PR that would be great otherwise I will try to make some time in the next couple of week. Thanks for raising!

jlord avatar Jan 12 '21 19:01 jlord

Hey Jessica,

nice to see you back here on the repo! As nothing moved here for a while, and we didn't really reach you, in July i took a fork of the app, first had it on my account and later transferred it to an organisation (https://github.com/Git-it-App/git-it-electron). I updated all dependencies, moved translations to transifex for easier management, basically rewrote quite much of the code and even updated some content changes of GitHub. - Result is an up-to date version of the app, with translations beeing managed on transifex (some translations still need to be copied over). - So how do you think about joining there and keeping the app alive as a community project, instead of having parallel projects?

  • Respective this specific change discussed here: I thought about this already, even moved the Organisations Repo to main quite a while ago and started on preparing the content-change two weeks ago. However, Git itself has not changed the default branch yet. -> As long as one does not initialise the Repo (as it is told in the app), GitHub does not produce the main branch. So normally completing the challenges should still be possible. Probably some other error happened to @buondevid? Did you probably init the repo on Github? -> As the challenges are valid as they are, i thought until now to leave the master branch as it is and to wait until Git itself changes the default branch to main. This avoids the need of a setting, which users don't really understand at the beginning of the tutorial. However, i'm open to discuss this.

How do you think about? Looking forward for your response! :) Greets, Jonas

jotoeri avatar Jan 19 '21 01:01 jotoeri

So how do you think about joining there (Git-it-App/git-it-electron) and keeping the app alive as a community project, instead of having parallel projects?

@jotoeri, what is it that you're looking to achieve here? More maintainers / velocity on the project?

Couldn't this also be achieved by leaving the project under the jlord username and:

  • opening a call for more maintainers here
  • potentially pulling over interesting commits from your project

karlhorky avatar Jan 19 '21 08:01 karlhorky

Hey Karl,

  • well, what i would appreciate, would be to merge the currently two projects back into one, having me and Jessica as maintainer from the two current branches, and yes, if you or others want to join - you're welcome!
  • More velocity is not necessary, the only thing, that needs to be cared for, are now dependency updates and changes on Git/GitHub. The app itself is in a good state, i think, it is not necessary, to have a fast evolution there.
  • (I thought about a second app already, covering some advanced topics of daily work, but that's different thing then.)

potentially pulling over interesting commits from your project

Well, that is around 300 commits? 😉 Indeed - one could do one massive merge or just pull everything, that would work. Picking just some single commits of it - could result in some more work to resolve that... - However - all of that would feel somehow like not appreciating the work i put into. It was quite much of a work, that i did. Now moving all of this back here, dissolving into which basically was a stale repository (i tried a few times to contribute here, at first!), that feels quite sad. That is relatable, no? So this is why i think it would be nice, to have it as a community project, beeing equal maintainers and to avoid the loss of maintenace based on one person...

Greets, Jonas :)

jotoeri avatar Jan 19 '21 12:01 jotoeri

I don't have an opinion, personally - I don't have any investment in either outcome. If it stays here, that's ok with me. If it goes to a new organization, that's fine with me too.

Regardless of the way forward, jlord/git-it-electron has ~3700 stars and ~1000 forks. Probably the project shouldn't lose these metrics.

Two approaches come to mind:

  1. Keep it under jlord. Easy and uncomplicated.

  2. Transfer ownership of the repository to a community-led organization. It would need to be considered carefully who would be a maintainer, what rights they would have, etc.

By the way, in either of these options, if your commits are considered valuable to the project, they could be transferred in a way that they are properly attributed to you - you would show up under the Contributors list, eg https://github.com/jlord/git-it-electron/graphs/contributors

karlhorky avatar Jan 19 '21 13:01 karlhorky

~3700 stars and ~1000 forks

Well stars, ok, some nice stuff. About the forks - how many of them are copied once and never touched again? 🤔 And tbh. - i'm not sure if i ever seroiusly looked onto this 'metrics' on any project.

could be transferred in a way that they are properly attributed to you

I know - but my text above was written having this knowledge already. 😉


So:

  1. Adding jessica as full maintainer/owner to the current organisation? Easy and uncomplicated? 😉

=> Let's wait and see, what Jessica thinks about...

jotoeri avatar Jan 19 '21 14:01 jotoeri

That's not actually an option that will retain the GitHub metrics. Metrics matter a lot.


Also, just realized we're spamming an unrelated issue here - sorry about that to the maintainers! 🤦‍♂️ You should probably open a new issue if you're interested in this.

And these comments should be marked as "Off Topic" - doing so for my previous replies.

karlhorky avatar Jan 19 '21 14:01 karlhorky

I am going to try and help out with a PR for this! I had the same issue and I'm happy someone else already pointed it out :)

izzyreiff avatar Jan 25 '21 17:01 izzyreiff

Thanks @izzyreiff , I would have done it myself if I was able to :)

buondevid avatar Jan 25 '21 18:01 buondevid

As a workaround, you can create a local master branch, switch to it, push it to GitHub and continues the Challenges :

git checkout -b master
git push origin master

Rom1deTroyes avatar Feb 15 '22 09:02 Rom1deTroyes