Question

I have done the following:

git add <filenames>
git commit
git push origin master:mybranch

From my origin server, I did the following:

git merge mybranch

All of my changes are now present on the origin server, however git (and myself) seems incredibly confused now. When I did a git status on the origin, two of the new files I added were present, but listed as untracked files. However, the modified files are not listed as modified.

When I do a git status on my remote server I receive the error Your branch is ahead of ‘origin/master’ by 1 commit.

When I do a git diff origin/master on my remote server all of my changes are listed as not present on the origin server.

What is going on here?

Answer 1

do a git pull in your master and then merge again
Which branch are you currently on?

usually this is how it goes:

git checkout somebranch
*make some changes
git add *any new files here*
git commit -am "commit message"
git checkout master
git pull origin master
git merge somebranch
git push

if the master-branch had any changes in it when you pulled you will need to merge those changes over to your working branch.

git checkout somebranch
git merge master