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

Fix README.md on merge into master from PR example #222

Merged
merged 3 commits into from Jun 20, 2023

Conversation

nmichlo
Copy link
Contributor

@nmichlo nmichlo commented Dec 13, 2022

Fix example based on discussion in #215

Summary of changes

Do any of the followings changes break current behaviour or configuration?

  • NO

How changes have been tested

  • in my own private repos to resolve the issues discussed in: squash and merge tags original branch not new target #215
    • don't tag old branch if PR is just closed (cancelled), instead of closed by merging
    • don't tag the original branch, rather tag the commit created by the merge (fixes squash and rebase PRs)

List any unknowns

  • N/A

Fix example based on discussion in anothrNick#215
Revert qoutes to match original config
@nmichlo nmichlo changed the title Update README.md Fix README.md on merge into master from PR example Dec 13, 2022
@sbe-arg
Copy link
Collaborator

sbe-arg commented Jun 17, 2023

Can you sort the conflicts so we get this merged?

@nmichlo
Copy link
Contributor Author

nmichlo commented Jun 19, 2023

@sbe-arg, I've resolved the conflict thanks!

@sbe-arg sbe-arg merged commit f7a8973 into anothrNick:master Jun 20, 2023
4 checks passed
@nmichlo nmichlo deleted the patch-1 branch June 20, 2023 08:12
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.

None yet

2 participants