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

Shorten lifetime of branches #75

Open
magoorden opened this issue Oct 5, 2022 · 1 comment
Open

Shorten lifetime of branches #75

magoorden opened this issue Oct 5, 2022 · 1 comment
Labels
documentation Improvements or additions to documentation

Comments

@magoorden
Copy link
Contributor

I notice that current devolpment of different issues are merged into new-cdd-function. Yet, this branch is 136 commits ahead of our main branch. Imho this is bad, as currently main cannot used as a base for further development.

So my two suggestions are

  1. Figure out when we will merge new-cdd-function into main, so that future development can actually be based upon main.
  2. In the future we should limit the lifetime of our branches to prevent this issue from happening again. We could, for example, say that branches (and subsequent pull requests) should be single issue only, but other rules are also possible.
@Brandhoej
Copy link
Contributor

  1. The plan is to merge new-cdd-function into main when 74 is closed.
  2. I agree on this. I personally think a branching strategy like Git Trunk is very good for its simplicity.
    Also, I think this issue might highlight the need for a for a CONTRIBUTING.md and CODE_OF_CONDUCT.md

@Brandhoej Brandhoej added the documentation Improvements or additions to documentation label Oct 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

No branches or pull requests

2 participants