1. Basic Git Commands

2. Resolving Merge Conflicts

• Merge Conflicts Occur When: Conflicts happen when Git cannot automatically merge changes. To resolve conflicts, follow these steps:

• 

  Manually Resolve the Conflict: Edit the file by choosing which code to keep (or both). Remove the conflict markers.

  

• 3. Working with Remotes

  

  

  

  

• 5. Tagging in Git

  

  

• 6. Reverting Changes

  

• 7. Git Configuration

  

• 8. Git Rebase

  

• 9. Undo Changes in Files