networkservicemesh / networkservicemesh/.github
Rework some steps in `resolve-conflicts` workflow
Nobody has claimed this yet.
- Dominant language
- JavaScript
- Stars
- 0
- Forks
- 11
- Avg merge
- 4m
- Merged PRs (30d)
- 4
Description
Description
We need to rework this condition in resolve-conflict workflow. This condition checks if the workflow has already tried to resolve conflicts in previous 10 commits. The problem is if a PR has less then 10 commits then the condition also checks main branch. If there are resolved conflicts from other PRs in the main branch they will be taken into account too. Therefore, sometimes this workflow doesn't work because of other PRs.
Issue
https://github.com/networkservicemesh/cmd-forwarder-vpp/pull/1102
Solution
We can use
git log --oneline main..HEAD
to get commits only from the current barnch
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start with .github/workflows/resolve-conflicts.yaml at lines 37-42 and inspect how the condition examines recent commits. Compare it with git log --oneline main..HEAD, then verify the workflow considers only commits from the current branch and is no longer affected by conflict resolutions on main.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, github-actions, yaml
- Domain
- ci-cd, devops
- Issue type
- Bug
- Difficulty
- 2/5
- Estimated time
- 1-3 hours
- Activity status
- Stale
- Clarity
- Clearly specified
- Newbie friendliness
- 40/100