How to resolve a Merge Conflict in GitHub Desktop

preview_player
Показать описание

Рекомендации по теме
Комментарии
Автор

This is so short to the point and so useful, thank you so much!!

lumacester
Автор

Only video that talks about this, thank you! :)

White_King
Автор

Best Video, precise and Short, thank you!

XoXkS
Автор

there is no option to use mine versus theirs like sourcetree? that makes sourcetree better

GraysonVoisinet
Автор

Um.. wanna tell us how to get the conflicts to show up?

riptiide
Автор

my github desktop wont let me press "commit" :/ nothing happens when I press it

Holagrimola