- If it says something like `212 commits ahead, 207 commits behind`, then type `git fetch` to update spigot
2. If you have changes you are working on type `git stash` to store them for later
- Later you can type `git stash pop` to get them back
3. Type `git rebase -i`
- It should show something like [this](https://gist.github.com/Zbob750/e6bb220d3b734933c320)
4. Replace `pick` with `edit` for the commit/patch you want to modify, and "save" the changes
- Only do this for one commit until you get more advanced and understand what `git rebase -i` does
5. Make the changes you want to make to the patch
6. Type `git add .` to add your changes
7. Type `git commit --amend` to commit
- **MAKE SURE TO ADD `--amend`** or else a new patch will be created
- You can also modify the commit message here
8. Type `git rebase --continue` to finish rebasing
9. Type `./rebuildPatches.sh` in the main directory
- This will modify the appropriate patches based on your commits
10. PR your modifications to github
## PR Policy
We'll accept changes that make sense. You should be able to justify their existence, along with any maintenance costs that come with them. Remember, these changes will affect everyone who runs Paper, not just you and your server.
While we will fix minor formatting issues, you should stick to the guide below when making and submitting changes.
## Formatting
All modifications to non-PaperSpigot files should be marked
- Multi line changes start with `// PaperSpigot start` and end with `// PaperSpigot end`
- You can put a messages with a change if it isn't obvious, like this: `// PaperSpigot start - reason