从远程Git存储库中提取更改并将我的分支提交到远程仓库

Question

my use case is. I have made changes to my local repo with a branch called feature A. The remote repo is called origin. There have been changes made to origin/master. I need to sync with origin master and push my changes(feature A) to the remote repo.

Answer 1

First you have to use git fetch to load data from your remote repository.
Then you can use git rebase origin/master to move your local changes on top of origin/master, on your local repository.

Now using git push you will push your branch feature A on the remote repository.
If you prefer to push on master, you will have to use the following syntax : git push origin master