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

Clarify Git branches #1679

Closed
3 tasks
Jackbennett opened this issue Mar 1, 2018 · 5 comments
Closed
3 tasks

Clarify Git branches #1679

Jackbennett opened this issue Mar 1, 2018 · 5 comments

Comments

@Jackbennett
Copy link
Contributor

Hello, We should agree something acceptable here and then;

  • Update README Current development builds a callout to contributing
  • Update CONTRIBUTING.md with the clarifications from this issue
  • Add a callout to CONTRIBUTING.md on cmder.net too (something small).

I'm sure there's various git flows with names we could subscribe to if you want but initially I thought to propose what my understanding was of how things seem to be done lately.

Proposal

Pretty much what we already have it's just not completely clear.

  1. Master holds the latest acceptable changes
  2. Keep master passing successful builds
  3. Releases are tested and then tagged by a human
  4. Any other branch can be for major changes somebody might want. But mainly work stays on master.

Concerns

  • As I understand our tests pretty much consist of only cmder compiling so that could use some work.

In the Past

Initially we always had work and PR's on the development branch. As releases were packaged from master. Since then we've started using git and githubs tags to publish releases. There was always some ambiguity when a change was worth waiting to go through development or just apply onto master.

I pretty much focus on powershell and try to help where I can, I don't think I've ever cut a release so let's hear from @cmderdev/trusted-contributors as well as the community going forward. Related to the stalled #1372.

@Stanzilla
Copy link
Member

I am fine with dropping development I've been ignoring it for ages anyway :D Apart from that, a nice CONTRIBUTING.md would be good to have, indeed. Other than that, feature branches are fine and the norm, just don't forget to delete them when your PR gets merged.

@DRSDavidSoft
Copy link
Contributor

I like to mention that @MartiUK has already done an awesome job for writing a CONTRIBUTING.md at: cmder/CONTRIBUTING.md.

Since it seems that every feature branch has its own name (@daxgames's great practice), I agree with @Stanzilla on dropping development, and sticking to the CONTRIBUTING.md's guide. Best practice to avoid confusion for newcomers like me!

@MartiUK
Copy link
Member

MartiUK commented Mar 13, 2018

The majority of outside contributors never followed the "fork and make changes in the development branch" so I'm fine with dropping it.

I'd like to find some time into looking into automated GUI testing since I would think it would be more appropriate than just running the included scripts for consistency.

@Stanzilla
Copy link
Member

@MartiUK I think you are the only person with enough permissions to delete it btw

@daxgames
Copy link
Member

daxgames commented Sep 3, 2018

@cmderdev/core @cmderdev/trusted-contributors Can we close this?

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

No branches or pull requests

5 participants