Git Resources

Basic Syntax

• git checkout

  • git checkout --theirs/--ours
    • Fix merge conflicts in Git?
  • git checkout another-branch file
    • How do I copy a version of a single file from one git branch to another?

• git rebase

  • git rebase --interactive
    • How to modify a specified commit in git?
    • How can I merge two commits into one?

• git revert

  • git revert -m
    • How to revert a merge commit that's already pushed to remote branch?
    • Git 撤销合并

Best Practices

• A Git Style Guide