I'm using the client on a mac and doing my pull request through the browser. I have read the guide, but I don't know what the term "rebase" means or what conflicts are and how to resolve them. Neither is addressed in the guide. Kraynic said: Did you check out the guide on the wiki? <a href="https://wiki.roll20.net/Beginner%27s_Guide_to_GitHub#Update_your_Repository_to_be_on_par_with_Roll20.27s_Repository" rel="nofollow">https://wiki.roll20.net/Beginner%27s_Guide_to_GitHub#Update_your_Repository_to_be_on_par_with_Roll20.27s_Repository</a> Edit: To give more direct comments, people would need to know how you are running github. Are you just working through a browser? Are you using a desktop client? Without knowing a starting point, it is hard to give advice. But the main thing is that you can't make changes in a fork made a month ago and submit a pull request that way. You need to be up to date with the main repository, make your changes, then submit the pull request.
