Uh oh!
There was an error while loading. Please reload this page.
Keep Spigot in its own submodule - #102
Conversation
Prevents us from having to merge spigot when it changes, instead we just update submodules. This seperates our history and better organizes the project. Based on TacoSpigot/TacoSpigot@cd6bc2f
| url = https://github.com/PaperSpigot/Paperclip.git | ||
| [submodule "Spigot"] | ||
| path = Spigot | ||
| url = https://Techcable@hub.spigotmc.org/stash/scm/spigot/spigot.git |
dc71482 to
7c53ae9CompareTechcable
commented
Mar 21, 2016
Every day this stays open without being pulled is another commit I have to rebase with. |
kashike
commented
Mar 21, 2016
@Techcable See @Black-Hole's comment. |
Techcable
commented
Mar 21, 2016
oooh. I thought he was clapping from being happy, not sarcasim. |
Ichbinjoe
commented
Mar 21, 2016
I vote keep it open to make Techcable mad :P
|
zachbr
commented
Mar 21, 2016
Then don't bother updating it, this isn't a PR that needs a big green happy merge button. I am more than happy to merge it manually when I have some time to make sure it works (which looks fine) and works well with our CI system. |
zachbr
commented
Mar 21, 2016
Merged w/ 667953b |
Merge pull request #118 from Techcable/spigot-in-submodule
Based on ideas in PR PaperMC#102, but rewritten for correctness. By: md_5 <git@md-5.net>
Prevents us from having to merge spigot when it changes, instead we just update submodules.
This seperates our history and better organizes the project.
Based on TacoSpigot/TacoSpigot@cd6bc2f