...
[15:22:56 CDT(-0500)] <EricDalquist> each of these commands may result in a merge conflict which would need to be resolved before moving on to the next command
[15:23:10 CDT(-0500)] <JoeMoore> OK, I get that.
[15:23:19 CDT(-0500)] <EricDalquist> "git cherry-pick 5cd2756fe1e5bee563c918c0f6abc38697d0f73e"
[15:23:19 CDT(-0500)] <EricDalquist> "git cherry-pick 927cbb1b2deae6bb92694b535d9b6ba3fcf63d4f"
[15:23:19 CDT(-0500)] <EricDalquist> "git stash pop"
[15:23:39 CDT(-0500)] <EricDalquist> so the cherry-pick command says "take the changes that commit X made and try to apply them to where I am right now"
[15:23:58 CDT(-0500)] <EricDalquist> it also copies over all the commit info (author, date, msg, etc)