How to update local repo with master?

Question

I am used to using SVN and only recently switched to GitHub.

I am trying to update some files in a GitHub repo, but I get this message:

To https://github.com/.../
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/.../'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I have tried commands like git fetch origin and git pull, but none of these make it so my current branch is not behind.

In SVN I'd just do svn update and then commit my changes.

I've also tried git pull origin, but I get a strange text message popping up and I have no idea how to interface with it: Updating a local repository with changes from a Github repository

Answer 1

1. Check your current branch with the command:

   git branch

   It will show your current branch name with an asterisk (*) next the name.

2. Then update your local branch with the remote branch:

   git pull origin branchname (This is the branch name with asterisks)

3. Now you can push your code to the remote repository if you have already committed your local changes with the command:

   git push origin branchname

If you haven't committed yet, first do a commit and then do a git pull and push.