Run git prune after applying patches#134
Open
Machine-Maker wants to merge 1 commit intoPaperMC:mainfrom
Open
Conversation
36e7356 to
8d1ece9
Compare
Member
|
This is a weird area where pruning much of the time is generally somewhat of an idea given how we rip the tree apart so violently, but, those loose objects can be used during a 3 way to aid in merging automagically |
Member
Author
|
Yeah, I don't know enough about how git works to know what exactly causes the issue I'm trying to fix here, but DenWav said PRs are open for it, so I took a stab at it. I haven't noticed anything bad so far, but just might not have done the one thing that this breaks, or hampers. |
Member
|
Reopening, not sure if this is relevant anymore (probably not?) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.Suggestion cannot be applied right now. Please check back later.
After changing branches, applying patches, changing to other branches, this seems to prevent the frequent message that instructs users to run
git pruneand then delete.git/gc.log.Can add if needed, the deletion of the .git/gc.log file, as that's what actually stops the warning message from being shown