Skip to content
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

Undo all of my previous changes #75

Merged
merged 7 commits into from
Nov 10, 2023

Conversation

inuitviking
Copy link
Contributor

This removes all my previous changes in my latest (and also closed) pull request (#72), as I believe it did not properly solve the issue; also, this helps clean up the mess I made in develop - sorry about that. :)

@inuitviking inuitviking requested a review from stankut November 9, 2023 14:36
@inuitviking inuitviking self-assigned this Nov 9, 2023
composer.json Outdated Show resolved Hide resolved
src/Form/SettingsForm.php Show resolved Hide resolved
@stankut
Copy link
Collaborator

stankut commented Nov 9, 2023

@rimi-itk do you accept this way of undoing the previous changes in develop?
that reverts #72

CHANGELOG.md Outdated Show resolved Hide resolved
@rimi-itk
Copy link
Collaborator

@rimi-itk do you accept this way of undoing the previous changes in develop? that reverts #72

@stanbellcom, if the changes undo all changes from https://patch-diff.githubusercontent.com/raw/OS2Forms/os2forms/pull/72 it should be fine.

@inuitviking, can you use https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request#reverting-a-pull-request to revert the changes rather than doing it manually?

@inuitviking
Copy link
Contributor Author

@rimi-itk do you accept this way of undoing the previous changes in develop? that reverts #72

@stanbellcom, if the changes undo all changes from https://patch-diff.githubusercontent.com/raw/OS2Forms/os2forms/pull/72 it should be fine.

@inuitviking, can you use https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request#reverting-a-pull-request to revert the changes rather than doing it manually?

This would require a merge of the pull request first, and only then can the pull request be reverted, as the article you linked to mentions.

Considering the changes have been made on develop (instead of a separate branch as it should have been) and the pull request is to merge develop into master, I personally think it would be better to merge this pull request, and keep the manual reversion I have made.

@inuitviking inuitviking requested a review from stankut November 10, 2023 12:12
@inuitviking inuitviking requested a review from rimi-itk November 10, 2023 12:12
@inuitviking inuitviking merged commit cfb3c1c into develop Nov 10, 2023
6 checks passed
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