Changes between Version 12 and Version 13 of WorkingWithGit


Ignore:
Timestamp:
Aug 20, 2016, 9:22:05 PM (8 years ago)
Author:
neverpanic (Clemens Lang)
Comment:

Offer help for failed pushes

Legend:

Unmodified
Added
Removed
Modified

  • WorkingWithGit

    v12 v13  
    8383}}}
    8484
     85Note that the push will fail if the remote repository has new changes. Contrary to Subversion, it does not matter whether your changes conflict with the remote ones. If this happens, you must update your local working copy as described in the [#updating section on fetch the latest changes] and re-try the push.
     86
    8587
    8688== Common `git` tasks & notes about MacPorts' Subversion export ==
    87 === Fetching the latest changes ===
     89=== Fetching the latest changes === #updating
    8890Git's equivalent to `svn update` is a little more complicated due to Git's distributed nature. Most of the complexity is not visible if you do not have commits in your working copy that have not been pushed yet. If both the local and the remote repository have changes (git calls them "diverged"), you will run into one of Git's core principles: Every commit has (at least) one parent commit, i.e. the commit history forms a directed acyclic graph.
    8991