Question

I have started to learn Git for a week,and I'm facing with a problem at work. The thing is I have made some changes while I was in develop branch and after I finish my work I tried to commit and push,however, I could not get rid of last error. Here you can see s screenshot of the smartgit and logs.

enter image description here

also you can see the log file here;

enter image description here

Was it helpful?

Solution

just make

git checkout develop
git pull
git push

you have this error because there are some new commits in the remote develop branch which you do not have in your local develop branch , this changes has to be fetch first

OTHER TIPS

make fetch first then push as this indicats that something changed at the remote

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top