Welcome to the CSC Q&A.
Get help and give help!
Write great code!
It is our choices... that show what we truly are, far more than our abilities.


+1 vote
asked in CSC305 Fall 2019 by (2.4k points)

2 Answers

0 votes

No, for our program, we have to resolve all the conflicts, then we can merge

answered by (2.3k points)
0 votes

What we did for our project was we added all the conflicts into a list. And removed all of them.

answered by (2.1k points)