Skip to content

Latest commit

 

History

History
8 lines (7 loc) · 307 Bytes

resolveConflict.md

File metadata and controls

8 lines (7 loc) · 307 Bytes

Resolving Conflict

  1. Created a file named conflict.js in main branch.
  2. Created a file named conflict.js in osoc branch.
  3. Merge the osoc branch to main branch.
  4. Resolving the conflict by adding the file conflict.js in main branch.
  5. Accepting the changes manually.
  6. Commiting the changes.