Skip to content

Commit 52f3631

Browse files
samsymonssamsymons
committed
Update merge conflict resolution instructions
1 parent b2cd373 commit 52f3631

3 files changed

Lines changed: 72 additions & 4 deletions

File tree

‎lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/merge-failed.yml.erb‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ html_notes: |
44
The <code><%= tag %></code> release has been successfully tagged and published in GitHub releases, <%= '' %>
55
but merging to <code><%= base_branch %></code> failed. Please resolve conflicts and merge <code><%= tag %></code> tag to <code><%= base_branch %></code> manually.<br>
66
<br>
7-
Issue the following git commands:
7+
First, disable branch protection on the apple-browsers repository:
8+
<ul>
9+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
10+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
11+
<li>Scroll down to the bottom and click 'Save changes'</li>
12+
<li>Authenticate with GitHub to approve the ruleset change</li>
13+
</ul>
14+
<br>
15+
Next, issue the following git commands:
816
<ul>
917
<li><code>git fetch origin --tags</code></li>
1018
<li><code>git checkout <%= base_branch %></code> switch to <%= base_branch %></li>
@@ -21,6 +29,15 @@ html_notes: |
2129
</ul></li>
2230
<li><code>git push origin <%= base_branch %></code> push merged branch</li>
2331
</ul>
32+
<br>
33+
Finally, re-enable branch protection:
34+
<ul>
35+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
36+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
37+
<li>Scroll down to the bottom and click 'Save changes'</li>
38+
<li>Authenticate with GitHub to approve the ruleset change</li>
39+
</ul>
40+
<br>
2441
Complete this task when ready and proceed with testing the build.<br>
2542
<br>
2643
🔗 Workflow URL: <a href='<%= workflow_url %>'><%= workflow_url %></a>.

‎lib/fastlane/plugin/ddg_apple_automation/assets/asana_create_action_item/templates/public-release-merge-failed-untagged-commits.yml.erb‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ html_notes: |
44
You've requested proceeding with public release despite untagged commits on the <code><%= branch %></code> branch, <%= '' %>
55
but merging to <code><%= base_branch %></code> failed. Please resolve conflicts and merge <code><%= branch %></code> to <code><%= base_branch %></code> manually.<br>
66
<br>
7-
Issue the following git commands:
7+
First, disable branch protection on the apple-browsers repository:
8+
<ul>
9+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
10+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
11+
<li>Scroll down to the bottom and click 'Save changes'</li>
12+
<li>Authenticate with GitHub to approve the ruleset change</li>
13+
</ul>
14+
<br>
15+
Next, issue the following git commands:
816
<ul>
917
<li><code>git fetch origin --tags</code></li>
1018
<li><code>git checkout <%= branch %></code> switch to the release branch</li>
@@ -18,6 +26,15 @@ html_notes: |
1826
</ul></li>
1927
<li><code>git push origin <%= base_branch %></code> push merged branch</li>
2028
</ul>
29+
<br>
30+
Finally, re-enable branch protection:
31+
<ul>
32+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
33+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
34+
<li>Scroll down to the bottom and click 'Save changes'</li>
35+
<li>Authenticate with GitHub to approve the ruleset change</li>
36+
</ul>
37+
<br>
2138
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>
2239
<br>
2340
🔗 Workflow URL: <a href='<%= workflow_url %>'><%= workflow_url %></a>.

‎spec/asana_create_action_item_action_spec.rb‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
374374
The <code>1.0.0-123</code> release has been successfully tagged and published in GitHub releases,#{' '}
375375
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>
376376
<br>
377-
Issue the following git commands:
377+
First, disable branch protection on the apple-browsers repository:
378+
<ul>
379+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
380+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
381+
<li>Scroll down to the bottom and click 'Save changes'</li>
382+
<li>Authenticate with GitHub to approve the ruleset change</li>
383+
</ul>
384+
<br>
385+
Next, issue the following git commands:
378386
<ul>
379387
<li><code>git fetch origin --tags</code></li>
380388
<li><code>git checkout main</code> switch to main</li>
@@ -391,6 +399,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
391399
</ul></li>
392400
<li><code>git push origin main</code> push merged branch</li>
393401
</ul>
402+
<br>
403+
Finally, re-enable branch protection:
404+
<ul>
405+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
406+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
407+
<li>Scroll down to the bottom and click 'Save changes'</li>
408+
<li>Authenticate with GitHub to approve the ruleset change</li>
409+
</ul>
410+
<br>
394411
Complete this task when ready and proceed with testing the build.<br>
395412
<br>
396413
🔗 Workflow URL: <a href='https://workflow.com'>https://workflow.com</a>.
@@ -645,7 +662,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
645662
You've requested proceeding with public release despite untagged commits on the <code>release/1.0.0</code> branch,#{' '}
646663
but merging to <code>main</code> failed. Please resolve conflicts and merge <code>release/1.0.0</code> to <code>main</code> manually.<br>
647664
<br>
648-
Issue the following git commands:
665+
First, disable branch protection on the apple-browsers repository:
666+
<ul>
667+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
668+
<li>Click on the 'Active' enforcement status dropdown and change it to 'Disabled'</li>
669+
<li>Scroll down to the bottom and click 'Save changes'</li>
670+
<li>Authenticate with GitHub to approve the ruleset change</li>
671+
</ul>
672+
<br>
673+
Next, issue the following git commands:
649674
<ul>
650675
<li><code>git fetch origin --tags</code></li>
651676
<li><code>git checkout release/1.0.0</code> switch to the release branch</li>
@@ -659,6 +684,15 @@ def fetch_assignee_id(task_id:, github_handle:, asana_access_token:, is_schedule
659684
</ul></li>
660685
<li><code>git push origin main</code> push merged branch</li>
661686
</ul>
687+
<br>
688+
Finally, re-enable branch protection:
689+
<ul>
690+
<li>Open the <a href='https://github.com/duckduckgo/apple-browsers/settings/rules/3717807'>Main Branch branch protection ruleset settings</a></li>
691+
<li>Click on the 'Disabled' enforcement status dropdown and change it to 'Active'</li>
692+
<li>Scroll down to the bottom and click 'Save changes'</li>
693+
<li>Authenticate with GitHub to approve the ruleset change</li>
694+
</ul>
695+
<br>
662696
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>
663697
<br>
664698
🔗 Workflow URL: <a href='https://workflow.com'>https://workflow.com</a>.

0 commit comments

Comments
 (0)