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.

Sign up for GitHub

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

Jump to bottom

Merging master into other branches is hard #139

Open
hofstee opened this issue Feb 4, 2020 · 0 comments
Open

Merging master into other branches is hard #139

hofstee opened this issue Feb 4, 2020 · 0 comments

Comments

@hofstee
Copy link
Collaborator

hofstee commented Feb 4, 2020

Whenever scripts and CI definitions update on master, the changes need to be propagated to the other branches for the Buildkite CI to work. Additionally, we usually want to have the branches running the most updated version of CI they can.

One way to fix this might be to create a scripts branch where updating the scripts is done and then merging that into both master and the other branches.
@hofstee hofstee changed the title Merging master into other branches is hard. Merging master into other branches is hard Feb 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@hofstee