Merged
Conversation
Owner
|
👍 I've "squash merged" your two commits, effectively suppressing your merge commit and the merge commit that would occur from a "normal" merge. In general, for a project like this with very few contributors, I'm not too bothered about a super clean git history. If you are working on a pull request over a long period and/or the pull request has lots of small commits, it would be good to rebase when it makes sense to do so. Otherwise I like to keep the commit history intact. |
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
2 participants
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.
I have forked the jg-rp/python-jsonpath. I made 3 changes to my local .gitignore. On the GitHub web app, it showed me that my forked main branch was out of sync with the upstream branch, so I clicked Synchronize. I did not "discard" first.
Now my fork says it's 2 commits ahead of the upstream branch. I understand the commit for .gitignore, but I don't know why it's including my sync/merge from your main to my forked main. There shouldn't be any differences I would need to push back upstream.
This is the first time I'm trying to create a pull request for a forked branch, so I'm still figuring this out. The only differences that should show up are the 3 changes in gitIgnore. If the merge is showing up as changes, maybe you can remove those from the pull request and just merge the gitIgnore changes?