Last active
January 16, 2021 00:39
-
-
Save RoboMWM/82f9a5ee50ee79b961034dcebd0a41b2 to your computer and use it in GitHub Desktop.
How to merge upstream
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # With Tuinity | |
| # Fetch Paper upstream | |
| ./tunity up up | |
| # Fetch Tuinity | |
| ./tuinity up | |
| # Apply Tuinity patches on top of Paper (or is it Tuinity and Paper on top of CB?) | |
| ./tuinity patch | |
| # build jar | |
| ./tuinity build | |
| # rebuild patches so the diff looks good (not needed if not publishing) | |
| ./tuinity rb | |
| # Commit | |
| scripts/upstreamCommit.sh |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment