Git contd

Reference Objects in Git

• In Git we have two reference objects
  • Branch:
    • This always points to latest commit done
    • The default branch name is master
  • Tag:
    • This always points to specific commit which is tagged

Create branches

• Watch classroom video

merging changes

• Three way merge:
  • This creates an extra commit which has two parents
  • This is generally done when the source branch (to which you want to merge the changes) and destination branch have different paths
    
• Fast Forward merge:
  • this doesnot create extra commit but branch moves ahead
  • This happens in the case when source branch has not changed after target branch creation.
    
• References:
  • Branches
  • merge
  • merge conflict
  • merge strategies
• Exercise:
  • Create a local repo
    • with branches
      • main
      • rel_v1.1
      • rel_v1.0
    • Create a situation
      • fast forward merge
      • three way merge
    • Showcase when mergeconflict arises and when it doesnt while merging branches