Getting error "Current commit is behind, skipping the release to avoid collisions"

[ykhandelwal913]

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

Additional context

[ykhandelwal913]

@hipstersmoothie can you help with above issue.