Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

A git push operation will push local changes in your local repository to the central source repository.

Often some one else will have pushed other changes before you, and GIT will require you to pull these changes before you can push.

Sometimes GIT might have trouble is you have changed the same file as another team member and this will result in a merge conflict.

A merge conflict is when GIT needs our help to figure out what changes we should keep and what we should abandon.It’s usually safer to begin with a git pull operation first - this is to get changes from other team members from the central repository into your local repository. GIT won’t let you push until you do this usually. To do it just do “git pull”. You might see merge conflicts which have to be resolved.

Then you can just do “git push”.

It’s that simple. Here is an example: