diff --git a/If you want to contribute to Forge.md b/If-you-want-to-contribute-to-Forge.md similarity index 92% rename from If you want to contribute to Forge.md rename to If-you-want-to-contribute-to-Forge.md index 641ff8a..89bffe4 100644 --- a/If you want to contribute to Forge.md +++ b/If-you-want-to-contribute-to-Forge.md @@ -110,4 +110,7 @@ An even better way is to add a function in `net.minecraftforge.event.EventFactor #### Before `gradle genPatches` & Committing Before committing, check if your IDE hasn't put in extra spaces/line breaks in the import section of your java-file. Eclipse tend to reorganize the imports to improve readability and will cause extra spaces/line breaks to appear in the `.java.patch`-files. Review your patches (`ClassName.java.patch`) and the diff-states of your uncommitted changes on these patches for extra `++`'s or `+ +`'s. This means an extra space/line break has been added. -Keep in mind that the original `.java.patch`-file never add extra spaces/break lines in between imports. \ No newline at end of file +Keep in mind that the original `.java.patch`-file never add extra spaces/break lines in between imports. + +#### How to squash commits +When Lex asks you to squash, you can check out the repo in GitHub client, then open git shell from the client. run `git rebase -i HEAD~` and the commit squashing will be done. To push those changes, run `git push -f`, then you've finished squashing commits. \ No newline at end of file