Skip to content

Merge script

Created by: silabs-krdosvik

The plan is to do merging between S and X-dv more frequent. Ideally, every PR is merged into x-dv (in that case the person that made the code can determent whether the code is suitable for X, instead of a random merge that don't have control of all code)

Script for the merge processes:

  • cv32e40s to cv32e40x-dv
  • cv32e40s/dev to cv32e40x/dev
  • cv32e40x/dev to cv32e40s/dev

Could not fin a good method for doing merging for cv32e40x-dv to cv32e40s.

The script works for me, so I hope it will work in general. If we just start using it we will figure out if there are needed changes.

I have made a lot of comments, let me know if you think it is too much.

I remember there was some suggestions for doing moving and substituting of 40x to 40s in a different manner, but it works as it is so I have let it be (as I cant remember the exact suggestions).

Merge request reports

Loading