An example of merging with a file conflict.
Example of an edit conflict
In class rpn project
Didn't finish the project!
RPN calculator, with test driven design