Skip to content

Instantly share code, notes, and snippets.

@runningdemo

runningdemo/git简明教程.md

Created October 16, 2014 11:30
Show Gist options
  • Save runningdemo/f83fb3d95696fda77987 to your computer and use it in GitHub Desktop.
Save runningdemo/f83fb3d95696fda77987 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git简明教程.md

repository的组成

local repository consists of three "trees".

first:

Git Merge

doucment

解决了冲突的文件后,需要将文件加入暂存区. git add 这样才能说明解决了confict.

Git Rebase

document

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment