获得合并分支的最佳方式与 master 不同

Question

I have started a job. I am responsible for updating the server with the latest commits as well. Forgive me if the question has been asked and I could not trace it.

There are two branches master and develop . In my case develop is the default branch.

I made a feature branch and pushed it to the remote repository. Now I don't remember that I made my feature branch from master or develop but the branch is merged in develop after feedback from client.

I logged in to server and checked the pointing branch by using git branch the branch pointer is on master I fetched the latest and took a pull but I got the message Already up to date But My code is not updated. But When I followed the same procedure on my local system it fetched the master and pulled the latest code. My local is also pointing to master

I checked onto develop on live but it is 132 commits behind I cannot make the mistake of fetching because the application can break. Kindly help me understand the concept of default and main branch and also How can I update server safely with only my feature branch

Answer 1

A git fetch would only fetch commits, without merging to your current branch, so no code would be updated.

A git pull would fetch+merge.

I cannot make the mistake of fetching because the application can break.

Fetching will not impact your application, will not move HEAD.

In your case, I recommend a git log --decorate --oneline --graph --all --branches , in order to see where HEAD is, on which branch.
From there, you can deduce where you need to be.