search

nus-cs2113-AY2122S1 / forum

3 stars 1 forks source link

How to get a copy of original team code without deleting my own 'tp'? #118

Open DuckWillow opened 3 years ago

DuckWillow commented 3 years ago

image Once I try to get the code from my teammates, there are some code conflict. I try to resolve it but ending up deleting the wrong lines. Now my own tp is different from the team tp and it shows 'not able' to 'fetch and merge'.

image May I know what should I do to keep my own tp the same as the team's tp?

DuckWillow commented 3 years ago

image I already tried many reverts, but nothing seems to happen, in this case, should I just delete my tp and fork a new tp?

DuckWillow commented 3 years ago

image This is my team's tp Utils.java, which has 64 lines. But mine only has 45 lines. image

DuckWillow commented 3 years ago

image Should I create a branch from the most recent commit and continue from there?