Home > Enterprise >  Git update cherry picked commit from PR
Git update cherry picked commit from PR

Time:08-22

enter image description here

As seen in the figure, I have cherry picked Commit A from PR1 which is not merged into main. Then I made some changes in Commit B and created a PR. Now some more changes are amended into Commit A say Commit A.1. But in my fork, the cherry picked commit is still Commit A.

Is it possible to Update Commit A to A.1 in my fork ?

CodePudding user response:

I found a solution after many tests.

  1. Cherry pick A.1 again into my fork (manually resolved merge conflicts)

  2. Squash Commit A.1 and A

  • Related