[Suggestion] Git-flow - Githubissues

austintoddj / canvas

Publishing on your own terms

http://trycanvas.app

MIT License

3.25k stars 519 forks source link

[Suggestion] Git-flow #261

Closed reliq closed 7 years ago

reliq commented 7 years ago

Hi guys,

I noticed there isn't really a set principle for branching, since there's only one branch I presume. Nevertheless, I'd like to suggest Git-flow going forward.

Cheetsheet: http://danielkummer.github.io/git-flow-cheatsheet/
Section on Atlassian's tutorials: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

What do you think?

Naoray commented 7 years ago

As you can see in e.g. #257 there exist one branch per feature,, but they get deleted after merging is complete.

reliq commented 7 years ago

@Naoray I see. It is in essence the same principle that way. However features would be prefixed with feature/, hotfixes with hotfix/ and so on.

austintoddj commented 7 years ago

That's a fine way to go about it @reliq. I have no problem with prefixing feature branches and so on. I do clean up the branches and delete them as soon as they're merged in however just for sanity's sake.

reliq commented 7 years ago

Cool 👍