Welcome to the CSC Q&A, on our server named in honor of Ada Lovelace. Write great code! Get help and give help!
It is our choices... that show what we truly are, far more than our abilities.

Categories

+6 votes
asked in CSC305 Fall 2019 by (1 point)

2 Answers

0 votes

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

answered by (1 point)
0 votes

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

answered by (1 point)
...