Conflict Problem

By mistake i have clicked on accept current change and my TODO’s are not updated in the module 2 files and i got my previous file so what to do now.

Do git reset --hard HEAD in your terminal. Then pull the stubs again from the gitlab. Then you will get merge conflict and that you can solve carefully.

See the above video for more information.