Merge-conflict module 2

i am facing merge conflict issue and the video you provided is inaudible how can i solve the issue?

try watching other youtube videos…

How to solve merge conflict?

  • Files marked with C are files contains merge-conflict. Open files marked with merge-conflict one at a time.
  • Now, You will see multiple option like “Accept Incoming Change”, “Keep Old Changes”,“Merge them”. Select Appropriate Option.
  • Once all merge conflict got resolved, run debugger for confirmation (for code-breaks).
  • Now, You can code as usual.