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://[email protected]/stash/scm/spigot/spigot.git |
Techcable
force-pushed
the
spigot-in-submodule
branch
from
dc71482 to
7c53ae9
Compare
|
Every day this stays open without being pulled is another commit I have to rebase with. |
|
@Techcable See @Black-Hole's comment. |
|
oooh. I thought he was clapping from being happy, not sarcasim. |
|
I vote keep it open to make Techcable mad :P
|
|
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. |
|
Merged w/ 667953b |
Merge pull request #118 from Techcable/spigot-in-submodule
5 participants
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