51. Resolve conflicts for the feature branch when Pull request is raised in Github Repo - GIT

preview_player
Показать описание
In this video, we will see how to resolve conflicts for the feature branch when the pull request is raised in the Github Repo - GIT.

If you like my video, please subscribe to my channel.

My Playlists:

My Courses Playlist Page:

#GIT #leelawebdev

Join this channel to get access to perks:
Рекомендации по теме
Комментарии
Автор

This is super helpful thank you very much for the clear explanation

Alex-bctt
Автор

Hi Leela, at 6:50 you do "git merge main" to merge the main into bugfix branch. At this point index.txt in main is empty and in bugfix branch its not empty. i.e. the index.txt file is different between main and bugfix branches so so how the outcome of this command is "up to date" ? why there is no conflict?

oriyungrais
Автор

Hi sir,
Sir i want to add password authentication on every push on github, want to know how to enable it... I searched a lot but every where i found how to disable it instead of enable.

metahubstore