Author: Merari Santana-Carbajal
“Solving merge conflicts takes conscious effort, but I can do it!”
What I like most about version control is that you can track your changes.
What I find most frustrating about version control are the merge conflicts that can arise when working in a collaborative setting.