zarf icon indicating copy to clipboard operation
zarf copied to clipboard

Create Auto MR if Merge Conflict Exists

Open RothAndrew opened this issue 3 years ago • 1 comments

As an air gap engineer, I would like to personally review the code changes if there is a merge conflict upon a Big Bang upgrade.

When upgrading Big Bang versions we would like to see a merge request created IF and WHEN a merge conflict is detected. This will allow the user to manually review the conflict and merge in the updates themselves.

Possible solution: when performing the repo.Push() within git.Push, handle the failed push if it is a merge conflict by warning the user, pushing to a new branch in gitea and linking to that branch on the CLI.


MIgrated from https://repo1.dso.mil/platform-one/big-bang/apps/product-tools/zarf/-/issues/6

RothAndrew avatar Sep 07 '21 22:09 RothAndrew

Old, stale. Closing. Can reopen if needed.

RothAndrew avatar Feb 04 '22 22:02 RothAndrew

Closing this again due to the complexity of external git servers.

jeff-mccoy avatar Jan 17 '23 17:01 jeff-mccoy