Skip to content

Conversation

@wesley-dean
Copy link
Contributor

Proposed Changes

  1. This adds a plugin for repolinter to the list of plugins

Readiness Checklist

Author/Contributor

This is a documentation change to add another plugin

  • Add entry to the CHANGELOG listing the change and linking to the corresponding issue (if appropriate)
  • If documentation is needed for this change, has that been included in this pull request

Reviewing Maintainer

  • Label as breaking if this is a large fundamental change
  • Label as either automation, bug, documentation, enhancement, infrastructure, or performance
    update

@echoix
Copy link
Collaborator

echoix commented Mar 20, 2025

Seems to already include older commits, is this intended?

@wesley-dean
Copy link
Contributor Author

wesley-dean commented Mar 20, 2025

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. 🤷

@echoix
Copy link
Collaborator

echoix commented Mar 20, 2025

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.
If having some of your PRs merged to your main was not intended, that's what you will want to do.

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).

@nvuillam
Copy link
Member

Or simply merge origin/main branch into your branch :) (using your git IDE)

Please can you also name correctly the PR ? :)

@echoix
Copy link
Collaborator

echoix commented Mar 20, 2025

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

@wesley-dean
Copy link
Contributor Author

your problem is

🤣 oh, I wish that was my only problem!!

Please can you also name correctly the PR

🤦

@wesley-dean
Copy link
Contributor Author

#4972

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants