I have made some changes on my local branch and created commit locally. when i push my local commit to remote, it prevents push as i have two updates recently from the remote branch of it waiting to be pulled. how to save my work safely and prevent this conflict. other people also work parallel on the same branch

branch name: feature-1

CodePudding user response：

You should run git pull origin feature-1 This will pull latest changes and merge them with your code. If there are conflicts you will have to fix them and add/commit them. Then push your branch and all should be fine.