Getting error "Current commit is behind, skipping the release to avoid collisions"
- Dominant language
- TypeScript
- Stars
- 2.5k
- Forks
- 221
- PR merge metrics
- No merged PRs in 30d
Description
**Describe the bug**
We often see the error while using auto shipit that "Current commit is behind, skipping the release to avoid collisions". This happens when the CI running the current commit and another commit got merged/updated in the main branch. How can we avoid this collisions. Is there any flag available to not to check if branch is upToDate? Or any other way to resolve the mentioned issue.
**To Reproduce**
- Commit a changes in main branch and let the CI kick in.
- when auto shipit try to release the version, update main branch with another commit.
- auto shipit fails with "Current commit is behind, skipping the release to avoid collisions"
**Expected behavior**
- It should lock the main branch to avoid branch being updated or dont check for updation of the main branch(isBranchUpToDate)
- Ideally CI should work without any issue
**Screenshots**
**Environment information:**
auto version: 11.1.5
cmd executed: `yarn --silent auto shipit --base-branch master -vvv`
```txt
```
**Additional context**
Contributor guide
No contributing guide indexed for this repository
Research direction
Start with the auto shipit entry point used by `yarn --silent auto shipit --base-branch master -vvv` and trace the `isBranchUpToDate` check. Reproduce the race described between CI and a new commit on the main branch, then identify the expected release behavior and add coverage for that scenario. Done means the documented collision no longer causes an avoidable release failure, or the supported resolution is clearly established.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, github, typescript
- Domain
- ci-cd, release
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 28/100