Skip to content

[ci skip] Specify rebase location in CONTRIBUTING#11255

Merged
Machine-Maker merged 3 commits into
PaperMC:masterfrom
hyperdefined:specify-rebase-location
Aug 16, 2024
Merged

[ci skip] Specify rebase location in CONTRIBUTING#11255
Machine-Maker merged 3 commits into
PaperMC:masterfrom
hyperdefined:specify-rebase-location

Conversation

@hyperdefined
Copy link
Copy Markdown
Contributor

As someone who doesn't understand how git works super well, I was confused when trying to rebase. Turns out I was in the wrong folder, and thought this could be added to help others understand where they need to rebase.

@hyperdefined hyperdefined requested a review from a team as a code owner August 13, 2024 05:14
@lynxplay
Copy link
Copy Markdown
Contributor

All of the commands in these sections are to be run in the respective -server or -api directories.
At best we could add something to the

Modifying Patches
Modifying previous patches is a bit more complex:

block saying that the below commands, unless specified otherwise, are ran in the respective -api or -server folders.

@Leguan16
Copy link
Copy Markdown
Contributor

All of the commands in these sections are to be run in the respective -server or -api directories.

At best we could add something to the


Modifying Patches

Modifying previous patches is a bit more complex:



block saying that the below commands, unless specified otherwise, are ran in the respective -api or -server folders.

That what I wanted to propose. But then I thought, it's only confusing until you understand patches. And that each patch is a commit to the -API, -Server module, and when you understand that, I think it's clear that you need to run these commands in those directories.

@lynxplay lynxplay force-pushed the specify-rebase-location branch from 8984a63 to 262e6af Compare August 14, 2024 15:30
@Machine-Maker Machine-Maker merged commit 81bfda8 into PaperMC:master Aug 16, 2024
@hyperdefined hyperdefined deleted the specify-rebase-location branch August 21, 2024 00:12
LeonTG pushed a commit to LeonTG/Paper that referenced this pull request May 17, 2026
* [ci skip] Specify rebase location in CONTRIBUTING

* Improve

* remove Paper-MojangAPI mention

---------

Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Merged

Development

Successfully merging this pull request may close these issues.

5 participants