-
-
Notifications
You must be signed in to change notification settings - Fork 281
Merge pull request #1 from oxsecurity/main #4971
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
update main
|
Seems to already include older commits, is this intended? |
|
No, I just messed it all up. I cut a branch from my fork before syncing it back to the oxsecurity repo and I hoped the merging of the commits in the sync wouldn't come through in this PR. sigh I can close this PR out and create a new one. 🤷 |
|
Your problem is because you have some commits ahead of the repo on your main branch of your repo. Usually, when you are behind, and in the GitHub interface, instead of "sync fork" (or something like that), you have the option to drop commits you have behind instead. After that, starting your branches from your (up to date) main, or from the edit button inside this repo for small things (it will suggest to use a branch on your fork when you have no access). |
|
Or simply merge origin/main branch into your branch :) (using your git IDE) Please can you also name correctly the PR ? :) |
|
But he'll still always have the same problem again and again, like just last PRs. His main branch was updated using a merge commit last week db01247, combining a commit from 2022 and from a commit of last week, instead of being a fast-forward |
🤣 oh, I wish that was my only problem!!
🤦 |
Proposed Changes
Readiness Checklist
Author/Contributor
This is a documentation change to add another plugin
Reviewing Maintainer
breakingif this is a large fundamental changeautomation,bug,documentation,enhancement,infrastructure, orperformanceupdate