Skip to content

Conversation

@dark0dave
Copy link
Collaborator

@dark0dave dark0dave commented Oct 25, 2024

A maintainer decide merge master into several prs. Creating a history nightmare. So now we need to clean and go through all the changes made.

@dark0dave dark0dave self-assigned this Oct 25, 2024
@dark0dave
Copy link
Collaborator Author

If its not obivious don't merge this until its ready. Apparenently that needs to be said.

@migueldelucasdoit
Copy link
Collaborator

Hello @dark0dave. It seems that we did something wrong when merging pending PRs. It seems that some of the changes done to the precommit and cliff configuration files were lost in the process and you're trying to restore them.
We apologize for any inconvenience this might have caused you.

Copy link
Collaborator

@migueldelucasdoit migueldelucasdoit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@migueldelucasdoit migueldelucasdoit merged commit 9789366 into master Oct 25, 2024
24 checks passed
@migueldelucasdoit migueldelucasdoit deleted the chore/cleanUp branch October 25, 2024 12:23
@dark0dave
Copy link
Collaborator Author

dark0dave commented Oct 25, 2024

I explixitly told you not to merge this.... @migueldelucasdoit

@dark0dave
Copy link
Collaborator Author

dark0dave commented Oct 25, 2024

Hello @dark0dave. It seems that we did something wrong when merging pending PRs. It seems that some of the changes done to the precommit and cliff configuration files were lost in the process and you're trying to restore them. We apologize for any inconvenience this might have caused you.

No, you double merged master into those prs. Don't do that.

@dark0dave
Copy link
Collaborator Author

There is no misunderstanding don't merge master into PRs

@dark0dave
Copy link
Collaborator Author

In case this process is not obivious to you. Grant approval, then allow me to merge the pr.

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