Skip to content

Latest commit

 

History

History
12 lines (10 loc) · 419 Bytes

File metadata and controls

12 lines (10 loc) · 419 Bytes

# python_G_colab

learning / practicing python in google colabotary

# Resources

# explaining merge conflict

  • changes 1
  • changes 2 (without Fetch Origin)
  • changed 3 (trying to Push without doing Pull Origin first, triggering Merge Conflict)
  • changes 2 (merge conflict detected)
  • changes 4 (resolved Merge Conflict with "changes 2")