Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content

Upstream changes shouldn't be automatically merged

Nishith Khanna requested to merge improve_ci into main

Description

Upstream changes shouldn't be merged automatically to main branch which is our production branch.

Technical details

As we do many changes in our code which is different from upstream therefore I believe the latest changes from upstream shouldn't be merge automatically to our main branch because of the following reasons:

  1. As the changes are a lot it will generally cause merge conflict which will generally lead to fail in pipeline most of the times.
  2. If there are no merge conflicts and code gets merged we will not know exactly what all things have changed and will have to bisect the code and fix the regressions from the update and many unintended changes from the upstream will get merged to our main branch.

So because of these reasons I believe that changes from upstream shouldn't be merged automatically to our main branch and new upstream changes should be merged manually after inspecting the changes done in code so as to fix the regressions and then push to main branch.

Though this will require manual intervention each time a new update is pushed but we will be able to solve the issues quickly as before merging to main branch we will be able to manually fix the regressions caused in new update.

Merge request reports