search

awslabs / aws-orbit-workbench

A Data Platform built for AWS, powered by Kubernetes.
https://awslabs.github.io/aws-orbit-workbench/
Apache License 2.0
127 stars 26 forks source link

Merge main to nightly conflicts #1284

Closed rb201 closed 2 years ago

rb201 commented 2 years ago

Rebasing nightly from main can potentially cause conflicts and therefore breaks the automating of merging main to nightly

rb201 commented 2 years ago

The original process was nightly rebasing main and creating a PR that auto merges.

Now, we simply merge main into nightly and telling git to resolve those conflicts by picking the files from main