How to merge the master/any branch into the main branch which is the default branch

Question

I have pushed my code to the branch name master, but the default branch is main
So, the main problem is, my code files is not visible on the main branch, where people navigate
Can anyone help me to merge the master name branch to the main branch which is the defualt brach, so when people visit my project, the code will be seen on that branch.

The main branch is looking like this:

What is the name of the project? It will be easier if I can look at the tree — Alex028502, Sep 26 '21 at 07:51
or just send a picture of it: `git fetch; gitk --all` and then make a screenshot (or use a different repo browser tool if you have one you prefer) — Alex028502, Sep 26 '21 at 08:07
Yes, my question is to merge master branch(holding all the application code) into the main branch. @CodeCaster — Sardar Ahmed Khan, Sep 26 '21 at 08:29

score 0 · Answer 1 · edited Sep 26 '21 at 08:49

0

You can clone the main branch in your local. And then trigger the command "git merge master". Then push the main branch.

edited Sep 26 '21 at 08:49

ouflak

2,458
10
44
49

answered Sep 26 '21 at 07:52

Niloy Roychoudhury

1

score 0 · Answer 2 · answered Sep 26 '21 at 08:11

0

you can push your master branch then use pull request to the main branch in github or gitlab and it will merge with your main branch, but make sure that you don't have any conflicts.

answered Sep 26 '21 at 08:11

Ahad Sheibani

1
1

Can, give me a favor by sending these step by step commands – Sardar Ahmed Khan Sep 26 '21 at 08:27
sure, which source control do you use?github,gitlab... – Ahad Sheibani Sep 26 '21 at 08:44
I am using the Github and for command line gitbash – Sardar Ahmed Khan Sep 26 '21 at 08:50
first push your branch then go to your repository in your github, after that you can see the pull request tab up to the left, then you can see the new pull request button click on that and set the base:main and compare:master https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request – Ahad Sheibani Sep 26 '21 at 08:59
let me know if that is working?? – Ahad Sheibani Sep 26 '21 at 09:02
Yes, can you [edit](https://stackoverflow.com/editing-help) your message and include all required informations such as docs and commands – Elikill58 Sep 26 '21 at 09:03
I put a document link above – Ahad Sheibani Sep 26 '21 at 09:26

How to merge the master/any branch into the main branch which is the default branch

2 Answers2