Update merge conflict resolution instructions (#60)

samsymons · web-flow · commit 1b23e82a9f8e · 2025-10-17T09:04:21.000+02:00
Task: https://app.asana.com/1/137249556945/project/1203301625297703/task/1211667131698044?focus=true This PR updates the instructions on how to handle merge conflicts.
diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/internal-release-tag-failed.yml.erb
@@ -4,7 +4,15 @@ html_notes: |
     Failed to tag the release with <code><%= tag %></code> tag.<br>
     Please follow instructions below to tag the branch, make GitHub release and merge release branch to <code><%= base_branch %></code> manually.<br>
     <br>
-    Issue the following git commands to tag the release and merge the branch:
+    First, disable branch protection on the apple-browsers repository:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
+    Next, issue the following git commands to tag the release and merge the branch:
     <ul>
       <li><code>git fetch origin</code></li>
       <li><code>git checkout <%= branch %></code> switch to the release branch</li>
@@ -23,7 +31,16 @@ html_notes: |
             </ul></li>
         </ul></li>
       <li><code>git push origin <%= base_branch %></code> push merged branch</li>
-    </ul><br>
+    </ul>
+    <br>
+    Finally, re-enable branch protection:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
     To create GitHub release:
     <ul>
       <li>Set up GH CLI if you haven't yet: <a data-asana-gid='1203791243007683'/></li>
diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/merge-failed.yml.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/merge-failed.yml.erb
@@ -4,7 +4,15 @@ html_notes: |
     The <code><%= tag %></code> release has been successfully tagged and published in GitHub releases, <%= '' %>
     but merging to <code><%= base_branch %></code> failed. Please resolve conflicts and merge <code><%= tag %></code> tag to <code><%= base_branch %></code> manually.<br>
     <br>
-    Issue the following git commands:
+    First, disable branch protection on the apple-browsers repository:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
+    Next, issue the following git commands:
     <ul>
       <li><code>git fetch origin --tags</code></li>
       <li><code>git checkout <%= base_branch %></code> switch to <%= base_branch %></li>
@@ -21,6 +29,15 @@ html_notes: |
         </ul></li>
       <li><code>git push origin <%= base_branch %></code> push merged branch</li>
     </ul>
+    <br>
+    Finally, re-enable branch protection:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
     Complete this task when ready and proceed with testing the build.<br>
     <br>
     🔗 Workflow URL: <a href='<%= workflow_url %>'><%= workflow_url %></a>.
diff --git a/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb b/lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb
@@ -4,7 +4,15 @@ html_notes: |
     You've requested proceeding with public release despite untagged commits on the <code><%= branch %></code> branch, <%= '' %>
     but merging to <code><%= base_branch %></code> failed. Please resolve conflicts and merge <code><%= branch %></code> to <code><%= base_branch %></code> manually.<br>
     <br>
-    Issue the following git commands:
+    First, disable branch protection on the apple-browsers repository:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
+    Next, issue the following git commands:
     <ul>
       <li><code>git fetch origin --tags</code></li>
       <li><code>git checkout <%= branch %></code> switch to the release branch</li>
@@ -18,6 +26,15 @@ html_notes: |
         </ul></li>
       <li><code>git push origin <%= base_branch %></code> push merged branch</li>
     </ul>
+    <br>
+    Finally, re-enable branch protection:
+    <ul>
+      <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+      <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+      <li>Scroll down to the bottom and click 'Save changes'</li>
+      <li>Authenticate with GitHub to approve the ruleset change</li>
+    </ul>
+    <br>
     Complete this task when done with merging, and re-run the public release workflow, still setting <i>Ignore unreleased changes when making a public release?</i> option to <code>true</code>.<br>
     <br>
     🔗 Workflow URL: <a href='<%= workflow_url %>'><%= workflow_url %></a>.
diff --git a/lib/fastlane/plugin/ddg_apple_automation/version.rb b/lib/fastlane/plugin/ddg_apple_automation/version.rb
@@ -1,5 +1,5 @@
 module Fastlane
   module DdgAppleAutomation
-    VERSION = "3.1.3"
+    VERSION = "3.1.4"
   end
 end
diff --git a/spec/asana_create_action_item_action_spec.rb b/spec/asana_create_action_item_action_spec.rb
@@ -319,7 +319,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
           Failed to tag the release with <code>1.1.0-123</code> tag.<br>
           Please follow instructions below to tag the branch, make GitHub release and merge release branch to <code>main</code> manually.<br>
           <br>
-          Issue the following git commands to tag the release and merge the branch:
+          First, disable branch protection on the apple-browsers repository:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
+          Next, issue the following git commands to tag the release and merge the branch:
           <ul>
             <li><code>git fetch origin</code></li>
             <li><code>git checkout release/1.1.0</code> switch to the release branch</li>
@@ -338,7 +346,16 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
                   </ul></li>
               </ul></li>
             <li><code>git push origin main</code> push merged branch</li>
-          </ul><br>
+          </ul>
+          <br>
+          Finally, re-enable branch protection:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
           To create GitHub release:
           <ul>
             <li>Set up GH CLI if you haven't yet: <a data-asana-gid='1203791243007683'/></li>
@@ -374,7 +391,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
           The <code>1.0.0-123</code> release has been successfully tagged and published in GitHub releases,#{' '}
           but merging to <code>main</code> failed. Please resolve conflicts and merge <code>1.0.0-123</code> tag to <code>main</code> manually.<br>
           <br>
-          Issue the following git commands:
+          First, disable branch protection on the apple-browsers repository:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
+          Next, issue the following git commands:
           <ul>
             <li><code>git fetch origin --tags</code></li>
             <li><code>git checkout main</code> switch to main</li>
@@ -391,6 +416,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
               </ul></li>
             <li><code>git push origin main</code> push merged branch</li>
           </ul>
+          <br>
+          Finally, re-enable branch protection:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
           Complete this task when ready and proceed with testing the build.<br>
           <br>
           🔗 Workflow URL: <a href='https://workflow.com'>https://workflow.com</a>.
@@ -645,7 +679,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
           You've requested proceeding with public release despite untagged commits on the <code>release/1.0.0</code> branch,#{' '}
           but merging to <code>main</code> failed. Please resolve conflicts and merge <code>release/1.0.0</code> to <code>main</code> manually.<br>
           <br>
-          Issue the following git commands:
+          First, disable branch protection on the apple-browsers repository:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
+          Next, issue the following git commands:
           <ul>
             <li><code>git fetch origin --tags</code></li>
             <li><code>git checkout release/1.0.0</code> switch to the release branch</li>
@@ -659,6 +701,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
               </ul></li>
             <li><code>git push origin main</code> push merged branch</li>
           </ul>
+          <br>
+          Finally, re-enable branch protection:
+          <ul>
+            <li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
+            <li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
+            <li>Scroll down to the bottom and click 'Save changes'</li>
+            <li>Authenticate with GitHub to approve the ruleset change</li>
+          </ul>
+          <br>
           Complete this task when done with merging, and re-run the public release workflow, still setting <i>Ignore unreleased changes when making a public release?</i> option to <code>true</code>.<br>
           <br>
           🔗 Workflow URL: <a href='https://workflow.com'>https://workflow.com</a>.
