Reviews App Wiki-git standard practice

Fetch and pull

• Fetch = pull + Merge
• Fetch-p, used to synchronize cleanup work to local repository

Rebase--yan

• Merge and Rebase are two methods of merging (on merge, rebase below)
  
  
  
• There is no difference between the results of the final integration, but rebase can produce a cleaner commit history
• Rebase actually transfers the conflict resolution task to the feature branch submitter for
• Once the commit object in the branch is published to the public repository, do not rebase the branch, which results in two commits with the same submitter, but SHA-1 different submissions!
• Rebase-i can edit the commit history (delete, merge, split, etc.) before rebase

Reviews App Wiki-git standard practice