git pullis used to update and merge your master branch with the official release repository
update and merge to local branch Edit
git pull origin master:master_local
update and merge Edit
not uptodate. Cannot merge. Edit
In this case the code beautifier made a change, but someone else was checking in this modified file on the origin/master repository.
git pull Password: Updating 78e7ce5..3923eab error: Entry 'src/ic_NativeImpl/NativeImpl_AV_ctrl/NativeImpl_AV_ctrl_md_AMINO_LINUX.c' not uptodate. Cannot merge.
That's because you have modified files, which you did not commit to your local repository.
git status # On branch master # Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: src/ic_NativeImpl/NativeImpl_AV_ctrl/NativeImpl_AV_ctrl_md_AMINO_LINUX.c # no changes added to commit (use "git add" and/or "git commit -a")
To be able to get the latest changes let's first commit and then push
git commit -a [master 46f193b] code beatifier 1 files changed, 2 insertions(+), 2 deletions(-)
git pull Password: Merge made by recursive.