TortoiseGit Tutorial 12: How to use cherry pick in git ?

preview_player
Показать описание
It shows how one can use cherry pick in git to apply commit from one branch to another branch and also when to use cherry pick option over git merge or rebase. Here, we use tortoiseGit tool to perform cherry pick operation.
Рекомендации по теме
Комментарии
Автор

Hi I am working in same branch called master. I committed two commits in same branch
Now downloaded first commit id using git review -d commitId(first commit Id) in gerrit
In gerrit I am seeing merge conflicts with second commit Id. to resolve merge conflicts should i do git-cherrypick-secondcommitid . but i dont want to commit those all second commit changes in first commit. I need to resolve conflicts
because first commit is already under review state

kumars