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

chore: update manual backport readme and trop comment with e backport command #272

Merged
merged 2 commits into from
Mar 25, 2024

Conversation

alicelovescake
Copy link
Member

@alicelovescake alicelovescake commented Mar 24, 2024

Problem:

  • Trop sometimes fails to automatically backport where there are merge conflicts. Instructions on how to manually backport is not easy to find.

This PR:

@alicelovescake alicelovescake requested a review from a team as a code owner March 24, 2024 16:49
@alicelovescake alicelovescake changed the title docs: add docs on manual backport in readme and trop comment docs: update manual backport readme and trop comment with e backport command Mar 24, 2024
@dsanders11 dsanders11 changed the title docs: update manual backport readme and trop comment with e backport command chore: update manual backport readme and trop comment with e backport command Mar 25, 2024
@dsanders11
Copy link
Member

Switched this to chore: just because it also has a functionality change (in the message that trop uses) so it's not purely docs:.

@dsanders11 dsanders11 merged commit d53d154 into electron:main Mar 25, 2024
4 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.

2 participants