Skip to content

git_understanding.md

Latest commit

 

History

History
10 lines (7 loc) · 336 Bytes

git_understanding.md

File metadata and controls

10 lines (7 loc) · 336 Bytes
Raw

Git Conflict Experience

What caused the conflict?

  • Both main and conflict-test branches edited the same line in README.md.

How did you resolve it?

  • Used Zed's merge tool to keep the main (HEAD) version, then staged and committed.

What did you learn?

  • Refreshed branch control and merge conflict knowledge.