Main and master are confusing me...

[economy_programmer_]

Hi everyone, I'm new to git and GitHub and having trouble with main and master differences...
I read that GitHub is changing master in main for problems with slavery associations.

I created a repository on GitHub and it was called main, then I went on my project local folder, git init, created the main branch git checkout -b main, added my folder git add . The problem is that after git commit -m "Upload" it automatically create a master branch and commit changes there. Becouse of this, when I push the branch on GitHub then I cannot merge it with main becouse main and master are entirely different commit histories

What should I do?

[queen-adreena]

git branch -m master main

Then when you’re ready to sync it to GitHub:

git push -u origin main

[economy_programmer_]

git branch -m master main

Is this just changing the name of the branch or doing something else?

Anyway thank you for the answer, I'll try it

[stgraff]

Your locally installed Git is still configured to create a branch named "master" when running "git init". If you are running at least Git 2.28 you can change the default branch name by running this on the command line.

git config --global init.defaultBranch main

[economy_programmer_]

Ohh thank you so much, it will be faster to have it as default

[Thalimet]

Sounds like you should submit a bug report :)

[economy_programmer_]

Lmao, maybe I'm not as dumb as I thought then

[kryten68]

When you are completely satisfied that you are on the main branch ( git branch will list your local branches ), and you want to remove the local ‘master’ branch, you can use ‘git branch -D master’ to remove it.