Skip to content

introduce epicast development guide #15

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

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Conversation

dfarrow0
Copy link
Contributor

  • includes detailed instructions for local development, checking code
    into the dev branch, and cherry-picking code over to the prod branch
  • the guide lives in the master branch since it is about the
    development process in general, and is not specific to the the dev
    branch

- includes detailed instructions for local development, checking code 
into the `dev` branch, and cherry-picking code over to the `prod` branch
- the guide lives in the `master` branch since it is about the 
development process in general, and is not specific to the the `dev` 
branch
@dfarrow0
Copy link
Contributor Author

@undefx undefx merged commit 38cbb61 into cmu-delphi:master Apr 29, 2020
@krivard
Copy link
Contributor

krivard commented Apr 30, 2020

What's the reasoning behind using cherry-pick instead of merge, is it for deploy.json purposes? If so, we may want to add a section about how to rebase a set of changes into a single commit, to reduce the number of cherry-picks (and thus the number of times something can go wrong) necessary to import a change.

@dfarrow0
Copy link
Contributor Author

dfarrow0 commented Apr 30, 2020

Not necessarily for deploy.json. I envision a scenario where multiple features/fixes are in-flight on the dev server at any given time. On Friday, some of those features will be ready for prime-time, while others aren't quite ready yet. I recommend cherry-pick to grab the specific commits which are ready to go to prod while leaving other commits behind in the dev chain.

Feel free to add that section though, especially if what you suggested is your expected workflow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants