Tower on Twitter: "💡Merge Conflicts💡 [9/10] Afraid of messing things up? You can always undo a merge conflict, return to a clean state, and start over. Some commands, like "git merge" and "
![5 Session 5: Git Collaboration and Conflict Management | Reproducible Research Techniques for Synthesis 5 Session 5: Git Collaboration and Conflict Management | Reproducible Research Techniques for Synthesis](https://learning.nceas.ucsb.edu/2020-11-RRCourse/images/git-conflict-02-pull-error.png)
5 Session 5: Git Collaboration and Conflict Management | Reproducible Research Techniques for Synthesis
![How to practice not freaking out when you see (master|MERGING) by using git merge –abort – 102 – Sara Ford's Blog How to practice not freaking out when you see (master|MERGING) by using git merge –abort – 102 – Sara Ford's Blog](https://sarafordnet.files.wordpress.com/2017/04/image41.png)