Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare detached setup branches for synchronization with develop #714

Open
1 of 6 tasks
MiniSean opened this issue Sep 26, 2022 · 0 comments
Open
1 of 6 tasks

Prepare detached setup branches for synchronization with develop #714

MiniSean opened this issue Sep 26, 2022 · 0 comments
Assignees

Comments

@MiniSean
Copy link
Member

MiniSean commented Sep 26, 2022

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:

  • Aprilia
  • Inspire
  • Pagani
  • Rebase and update develop-branch.
@MiniSean MiniSean self-assigned this Sep 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

When branches are created from issues, their pull requests are automatically linked.

1 participant