git use notes (3) Cherry Pick__git

Create a local branch locally

Repo start Cherrypickbranchname.

Then git cherry-pick-x <commitid>

If there is a conflict, then use the Meld tool I mentioned earlier.

Meld *********.java (conflicting files)

You need git add after you have modified the file. Then git commits. This completes a change of cherrypick.

You can pick n change at once in a local cherry.

If you feel that the current change does not need to be used during the Cherry-pick process

git reset

Git checkout.

This allows you to discard the current change.

If you have a local branch that has 10 change, and I want to discard 5th, I'll use git revert.

Of course I have review site here, just to the first 4 change before the merge.

Then the remaining 5 change all cherrypick to another new local branch,rebase already merge code, and then repo upload.

The commit of the change is

git fetch ssh://******.com:33333/platform/vendor/semc/packages/apps/gallery REFS/CHANGES/93/200893/5 && git Cherry-pick Fetch_head

Other commands:

Repo Download Platform/vendor/semc/packages/apps/gallery 200893/5

git fetch ssh://******.com:29418/platform/vendor/semc/packages/apps/gallery REFS/CHANGES/93/200893/5 && git Checkout Fetch_head

Git pull ssh:/******.com:29418/platform/vendor/semc/packages/apps/gallery refs/changes/93/200893/5

git fetch ssh://******.com:29418/platform/vendor/semc/packages/apps/gallery REFS/CHANGES/93/200893/5 && git Format-patch-1--stdout Fetch_head