History / Resolving merge conflicts

Revisions

Adding info from https://github.com/twindle-co/twindle/issues/273

melissahuertadev committed Oct 23, 2020

d332083
Updated Resolving merge conflicts (markdown)

Akshay2996 committed Oct 21, 2020

5300c92
Updated Resolving merge conflicts (markdown)

Akshay2996 committed Oct 21, 2020

7c25e4c
Updated Resolving merge conflicts (markdown)

Akshay2996 committed Oct 21, 2020

d936dca
Resolving merge conflict using Terminal (Updated)

Akshay2996 committed Oct 21, 2020

a452a8f
Updated Resolving merge conflicts (markdown)

nishanknavelkar committed Oct 17, 2020

5cce9d3
removed the profile link and reopened the issue so others can contribute

nishanknavelkar committed Oct 17, 2020

a8b8b14
Updated Resolving merge conflicts (markdown)

nishanknavelkar committed Oct 17, 2020

13010f7
Added 'Resolving Merge Conflicts'

thunder-coding committed Oct 17, 2020

45e82f3