Revise MERGE_CONFLICTS.md to reflect PR workflows

UMM-CSci-3601 / intro-to-git

A group exercise practicing with various git ideas and tools

MIT License

2 stars 7 forks source link

Closed helloworld12321 closed 2 years ago

helloworld12321 commented 2 years ago

Previously, MERGE_CONFLICTS.md assumed you would just be merging everything to main locally.

Closes #71.