Closed larsenv closed 7 years ago
You should probably try to rebase instead of merge. You might work on a new branch for each PR you want to make as well. That way, they won't likely conflict with each other. Here is a nice article about forks: https://www.atlassian.com/git/articles/git-forks-and-upstreams
Anyway, thanks a lot ;v)
Actually more than 10 games...
I screwed up when trying to merge everything so there's more commits. Sorry. I tried to get rid of them but nothing. This kind of stuff with GitHub confuses me!