view page source - page history - about editing

Revision History: Git

This is revision 334 of the page Git, as it appeared on Thu, 23 Jan 2014 14:10:35 -0800.

Things SVN can do that Git can't

  1. Checkout into a non-empty directory; you have to checkout into a temporary directory, move the .git folder into the non-empty directory, and run a git reset --hard
  2. Add an empty folder. Merge branch back in:
    1. git checkout master - switch back to master and update local copy to master
    2. git pull origin master - update local Git from remote Git
    3. git merge (new-branch-name) - do the merge from the given branch (I don't know what happens with conflicts!)
    4. git push origin master - push local Git to remote Git
    Categories: Git | Subversion

view page source - what links to here? - page history - top
Last edited by jevon jevon 60 months ago