hackforla / tdm-calculator

DTLA Hack for LA is partnering with Los Angeles Department of Transportation (LADOT) to develop a Traffic Demand Management (TDM) calculator tool. This tool will help planners at LADOT and real estate developers to meet the Los Angeles’s Mobility Plan goals by 2035.
https://tdm.ladot.lacity.org
GNU General Public License v2.0
48 stars 32 forks source link

Develop guide/ info on how to use Git for our project #41

Closed entrotech closed 4 years ago

entrotech commented 5 years ago

Define git branch naming convention https://dev.to/hardkoded/how-to-organize-your-git-branches-4dci https://stackoverflow.com/questions/273695/what-are-some-examples-of-commonly-used-practices-for-naming-git-branches

entrotech commented 4 years ago

Need to update documentation in contributinng.md for HotFixes after change to Git Flow

fyliu commented 4 years ago

I found an existing one for reference: https://github.com/thoughtbot/guides/tree/master/protocol/git

Code review: https://github.com/thoughtbot/guides/tree/master/code-review

Interesting git aliases to borrow: https://github.com/thoughtbot/dotfiles

joelparkerhenderson commented 4 years ago

https://github.com/gitalias

For git aliases, here's what I use and advocate for all of HfLA to choose - it's the best git alias list that I've gathered from hundreds of projects, and that I've professionally used with dozens of teams.

I'm happy to teach it one night too, and help each team customize it as desired.

fyliu commented 4 years ago

@joelparkerhenderson this is great! Just need to replace a few "origin/master" with whatever the dev/project is using as the remote merge target.

ExperimentsInHonesty commented 4 years ago

@entrotech is still working on this.
next steps: are making sure eslint issue is working #251 make sure application is running unit tests after people do a commit #235

ExperimentsInHonesty commented 4 years ago

@entrotech Where are we at with this issue

  1. Progress
  2. Blocks
  3. Availability
  4. ETA
joelparkerhenderson commented 4 years ago

Here's git branch name info, including conventions, and how to edit branch descriptions (which is worth doing IMHO).

https://github.com/joelparkerhenderson/git_branch_name

entrotech commented 4 years ago

Fixed in PR #274 by adding section for HotFix reelases.