Update merge conflict resolution instructions#60
Merged
Conversation
ayoy
approved these changes
Oct 17, 2025
Contributor
ayoy
left a comment
ayoy
left a comment
There was a problem hiding this comment.
Looking great @samsymons! Thanks a lot 🎉
https://app.asana.com/1/137249556945/project/1206713765026113/task/1211669898547614?focus=true
samsymons
added a commit
to duckduckgo/apple-browsers
that referenced
this pull request
Oct 17, 2025
<!-- Note: This template is a reminder of our Engineering Expectations and Definition of Done. Remove sections that don't apply to your changes.⚠️ If you're an external contributor, please file an issue before working on a PR. Discussing your changes beforehand will help ensure they align with our roadmap and that your time is well spent. --> Task/Issue URL: https://app.asana.com/1/137249556945/project/1203301625297703/task/1211667131698045?focus=true Tech Design URL: CC: ### Description Updates the monorepo with the new Fastlane merge conflict instructions: duckduckgo/fastlane-plugin-ddg_apple_automation#60 ### Testing Steps <!-- Assume the reviewer is unfamiliar with this part of the app --> 1. Nothing to test here, see [Fastlane PR](duckduckgo/fastlane-plugin-ddg_apple_automation#60) for the changes ### Impact and Risks <!-- What's the impact on users if something goes wrong? High: Could affect user privacy, lose user data, break core functionality Medium: Could disrupt specific features or user flows Low: Minor visual changes, small bug fixes, improvement to existing features None: Internal tooling, documentation --> #### What could go wrong? <!-- Describe specific scenarios and how you've addressed them --> ### Quality Considerations <!-- Focus on what matters for your changes: - What edge cases exist? - How does this affect performance? - What monitoring have you added? - What documentation needs updating? - How does this impact privacy/security? --> ### Notes to Reviewer <!-- Anything specific you want reviewers to focus on --> --- ###### Internal references: [Definition of Done](https://app.asana.com/0/1202500774821704/1207634633537039/f) | [Engineering Expectations](https://app.asana.com/0/59792373528535/199064865822552) | [Tech Design Template](https://app.asana.com/0/59792373528535/184709971311943) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Updates Fastlane plugin to 3.1.4 for iOS and macOS, with minor transitive AWS gem bumps in lockfiles. > > - **Dependencies**: > - **Fastlane plugin**: Bump `fastlane-plugin-ddg_apple_automation` from `3.1.3` to `3.1.4` in `iOS/fastlane/Pluginfile` and `macOS/fastlane/Pluginfile`; update corresponding entries in `iOS/Gemfile.lock` and `macOS/Gemfile.lock` (revision/tag). > - **Transitive gems**: Minor version bumps in `Gemfile.lock` for `aws-partitions` (`1.1172.0`→`1.1173.0`), `aws-sdk-kms` (`1.113.0`→`1.114.0`), and `aws-sdk-s3` (`1.199.1`→`1.200.0`). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 182da1d. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Dominik Kapusta <dkapusta@duckduckgo.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Task: https://app.asana.com/1/137249556945/project/1203301625297703/task/1211667131698044?focus=true
This PR updates the instructions on how to handle merge conflicts.
How to test: