search

marksorel8 / Wenatchee-screw-traps

1 stars 1 forks source link

git workflow Q #2

Closed marksorel8 closed 5 years ago

marksorel8 commented 5 years ago

Hi @mdscheuerell @ebuhle, if I wan to modify Eric's multi-year model to eliminate some of the hierarchical structure across years, would the best way to do that be to make a new branch? Something like "independent_multi_year" and then work on the file. Or is it better to just copy Eric's model and give it a new name?

ebuhle commented 5 years ago

would the best way to do that be to make a new branch?

Yes.

I typically have a generic develop branch for new/improved features, which I'll periodically merge back into master so that master is "fully deployable". There are other ways to do it, though, including dedicated branches for specific features as you suggest.