Do we need to commit and push after merge conflicting?

  1. All conflicting merge are solved.

  2. 15 mins

  3. Do we need to commit and push after merging conflict?

no, you need not commit and push after solving merge conflicts. proceed with tasks and at end of module you can commit and push to check the assessment result