These are the steps to cherry pick specific commits from a repo. These worked pretty well for what I was doing which was trying to get changes from one repo into another repo after I had made large sweeping changes.
There was some hassle in having to abort a cherry pick and get another commit first as there were conflicts. However overall it was a pleasant enough experience. I think there is probably some clean GUI that could be set up to make this much easier.
Without further ado.
The first step is to add the repo you want to cherry pick from as an upstream:
git remote add upstream https://github.com/mbullr/ScarletDME.git
Next we fetch the data:
git fetch upstream
Once we have the branches and the data, we can use cherry pick:
git cherry-pick #commit
This should pull in the changes into our current branch. If there are merge conflicts or file system changes, we will need to handle them here.
Once everything has been committed and and pushed out we can remove the upstream.
git remote remove upstream