Skip to content

feat: add workflow for checking unresolved conflicts#80

Merged
asdolo merged 1 commit intomasterfrom
feat/add_workflow_for_checking_unresolved_conflicts
Nov 26, 2024
Merged

feat: add workflow for checking unresolved conflicts#80
asdolo merged 1 commit intomasterfrom
feat/add_workflow_for_checking_unresolved_conflicts

Conversation

@asdolo
Copy link
Copy Markdown
Collaborator

@asdolo asdolo commented Oct 22, 2024

What does this do?

This PR adds a new GitHub workflow that checks if there are unresolved conflicts in the code and it fails if they are.

Why did you do this?

  • To add an extra safety check in our pipeline.
  • It is part of a bigger task that involves automating the update process of a project that was created using this template. That automation script tries to solve merge conflicts as best as possible, but in some cases it introduces some merge conflicts that GitHub's interface doesn't show as Merge Conflict in the Pull Request page.

Who/what does this impact?

Every project using the next version of the template. They should add the new "check-conflicts" check in their branch protection ruleset: (Repository settings > Rules > Rulesets > Select branch protection ruleset > Expand "Require status checks to pass" rule > Click on "Add checks" and select the "check-conflicts" check).

How did you test this?

I tested the workflow in a temporal test repository.

@asdolo asdolo self-assigned this Oct 22, 2024
@asdolo asdolo requested a review from a team as a code owner October 22, 2024 21:33
@github-actions
Copy link
Copy Markdown

💯 Test Coverage

Lines Statements Branches Functions
Coverage: 51%
50.69% (256/505) 46.63% (104/223) 36.12% (69/191)

😎 Tests Results

Tests Skipped Failures Errors Time
68 0 💤 0 ❌ 0 🔥 26.683s ⏱️
👀 Tests Details • (51%)
File% Stmts% Branch% Funcs% LinesUncovered Line #s
All files50.6946.6336.1251.66 
report-only-changed-files is enabled. No files were changed in this commit :)

Copy link
Copy Markdown
Collaborator

@fernandatoledo fernandatoledo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"but in some cases it introduces some merge conflicts that GitHub's interface doesn't show as Merge Conflict in the Pull Request page."

Thank you so much for introducing this fix!!! 🚀 👏

@asdolo asdolo merged commit b3e51c8 into master Nov 26, 2024
@asdolo asdolo deleted the feat/add_workflow_for_checking_unresolved_conflicts branch November 26, 2024 15:29
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.

3 participants