Prepare detached setup branches for synchronization with develop - Githubissues

DiCarloLab-Delft / PycQED_py3

Python3 version of PycQED using QCoDeS as backend

MIT License

67 stars 40 forks source link

Prepare detached setup branches for synchronization with develop #714

Open MiniSean opened 1 year ago

MiniSean commented 1 year ago

Expected behaviour

The operational setups (Inspire, Aprilia, Pagani) should at all times be compatible with latest version of develop-branch.

Actual behaviour

Develop-branch is ahead for all 3 setups with no easy way of inheriting its changes.

Solving the issue

Step-wise solution is provided:

[ ] Construct local (detached) branches with all relevant commits (minimally necessary for normal operations)
[ ] Merge current develop-branch on each of the local (detached) setups. Starting from the 'least-distant-branch' (close to develop in terms of commits).

Ensure basic CI passes before pushing the updated local branch (now compatible with latest version of develop) and continue:

[x] Aprilia
[ ] Inspire
[ ] Pagani
[ ] Rebase and update develop-branch.