search

OutpostUniverse / NetFixServer

0 stars 0 forks source link

Game server refactor cherry pick #37

Closed Brett208 closed 4 years ago

Brett208 commented 4 years ago

I tried cherry picking. Not sure why it caused the 2 merge commits.

DanRStevens commented 4 years ago

Yeah, I'm not sure what caused the merge commits. Looks pretty weird though. Did you try to cherry pick to a clean branch from master? And if so, was the it same commit on master?

Another way might be to use git rebase and delete the last commit.

Brett208 commented 4 years ago

I tried using a command called cherry pick from this commit in TortoiseGit. There is another cherry pick menu item, but I couldn't seem to get to select branches with it to move the commit into. I'd like to try it again, maybe just using the command line sometime in the future...

DanRStevens commented 4 years ago

Usually you switch to the branch you want to move the changes to, and then choose where to cherry-pick from. Sounds like you might have been on the source branch, rather than the destination branch.