[ci skip] Changing the order of the rebase with autosquash command in the contributing.md #6974
+1
−1
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
I was attempting to edit an older patch to get the feel for doing so as I want to eventually assist with fixing bugs/creating new features. I ran into some weirdness when trying to rebuild my patches and that boiled down to the command listed for rebasing with autosquash here acting weird on Windows(and maybe other systems).
When rebasing using the command provided there I was ending up with Spigot patches in the end after rebuilding them. I posted in paper-dev and MM pointed out that it'd be caused by not rebasing with the
base. Apparently, the order of the arguments needs to be quite specific otherwise it doesn't actually rebase using that tag. I tried changing the order togit rebase -i --autosquash baseas told by MM and it worked properly and was only rebuilding Paper patches.Not too sure why it wasn't working properly but I thought of making a PR to update the contributing guide in case anyone else runs into that issue as it looks like the order doesn't affect Linux at all.
Thanks and I hope to make more PRs in the future :D