![]() If you want to get rid of your cherrypicked branch do git branch -D lrvice_moretargets_cherries. Similar to how git allows you to cherry-pick a commit from another branch onto the current branch, Mermaid also supports this functionality. ![]() If you forgot the branch name or uncertain on which branch you are: git branch -l is your friend.Git never loses those commits and through commands like git log and git reflog they can be found and cherry picked back to life. If I cherry pick from dev branch into test branch by way of dev-to-test branch, then the commits which I cherry picked will be included in the next pull request from dev branch into test branch even though their content was already added into test branch. Sometimes a pull request might get closed without merging. It means that we can actually integrate any individual commit. If you wish, you can still return to the version of the PR with git checkout lrvice_moretargets_cherries. Cherry-picking commits creates new commits with the same content. As a powerful git command, it enables us to pick a commit from one branch and apply it to another.Reverting as easy as: git checkout master, that's all.Use retropie_setup.sh / retropie_packages.sh scripts as usual +rp_module_desc="C64 / C128 / PET / Plus4 / VIC20 emulator - port of VICE for libretro" vsf\n\nCopy your Commodore 64 games to $romdir/c64" +++ -10,37 +10,57 emulator - port of VICE for libretro" a/scriptmodules/libretrocores/lr-vice.sh The ideal solution would be to leave a comment asking for the contributor to submit again his/her pull request with only the 2 commits, in order for you to apply said PR (pull request) without having to do any work. Optional: Check if it worked: git diff origin/master output should start like this: diff -git a/scriptmodules/libretrocores/lr-vice.sh b/scriptmodules/libretrocores/lr-vice.sh Side note: Now you may understand why it is useful to have a PR squished to one commit. branch: git cherry-pick e5665ae (first seven characters of above commit are sufficient) Put the cherry (or cherries if more than one commit) in your basket, errm. Create a new branch based on the target of the Pull Request 2. Github Desktop allows you to select multiple commits by shift-dragging commit and right click to cherry-pick all X amount of commits assuming theyre in linear order. List commits where PR is ahead of current master: git log HEAD.PR_3126 (Should list one commit: e5665ae90a0d1bacd3f904194bb263a93cd2d19d)Ĭreate a new branch to hold the "ahead commits": git checkout -b lrvice_moretargets_cherries Update your local repo to remote origin/master: Run git pullĬreate a branch with all changes of a pull request (replace 3126 with your specific PR you want to try) (ahead and behind origin/master): git fetch origin pull/3126/head:PR_3126 ![]() I am using RetroPie-Setup and PR 3126 as sample but it is not limited to this repo/PR. This short sketch outlines the process to try pull requests (PR) before they are merged into the master.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |