[English] [Git] 10 Resolve Rebase Conflicts

preview_player
Показать описание
[English] [Git] 10 Resolve Rebase Conflicts
Рекомендации по теме
Комментарии
Автор

Even after 3 years this is still helpfull thanks buddy :)

vinayakhegde
Автор

thankyou for tutor

im from indonesia,
nice to meet you...

muhammadaulia
Автор

I have tried the steps, but here is my issue:

- I'm in the feature branch (changing some feature in a component)
- and then git pull rebase origin/dev
- conflicts are everywhere
- I solved all the conflicts
- when I tried to run the app (im doing react native)
- i dont get my changes in my feature branch local changes (all the features I just did is not applied to the current rebase)
- I abort the rebase

bhakti