I\'ve been working with a team for almost a year now. It\'s always been easy to use github/git to pull and push changes using:
git pull git add . git commit
You simply need to commit the changes if after a merge from another branch you this swap error message. I git added - green files not committed. I committed the files - then done.