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: multiple merge conflicts #2405

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Conversation

Garzas
Copy link
Contributor

@Garzas Garzas commented Nov 9, 2023


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

When there was more than one merge conflict automatic cherry pick failed

Solutions

  • Use awk to set the Output Record Separator (ORS) to \n, which echo -e in bash can interpret as a newline
  • Pipe the output to sed to replace the last \n with \n, to don't end up with an extra newline at the end.
  • Move PR_BODY to script to handle properly variable formatting

@AndroidBob
Copy link
Collaborator

Build 1710 succeeded.

The build produced the following APK's:

@AndroidBob
Copy link
Collaborator

Build 1726 succeeded.

The build produced the following APK's:

@Garzas Garzas enabled auto-merge (squash) November 13, 2023 11:40
@Garzas Garzas merged commit fa86e9c into release/candidate Nov 13, 2023
7 checks passed
@Garzas Garzas deleted the fix/cherry-pick-conflicts branch November 13, 2023 11:55
@AndroidBob AndroidBob mentioned this pull request Nov 13, 2023
4 tasks
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator

Build 1771 succeeded.

The build produced the following APK's:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants