search

ICT-Infer / timelog

Time sheet time tracking
ISC License
1 stars 0 forks source link

Per-feature and per-bugfix branches #34

Closed yarwelp closed 9 years ago

yarwelp commented 9 years ago

When all features are committed in same branch the way I am currently doing on branch devel, certain incomplete features such as issue #33 block other features which would otherwise be able to merge into master.

yarwelp commented 9 years ago

Could then merge feature and bugfix branches into devel for testing without blocking individual features and bugfixes from being merged into master.

Should perhaps also have a staging branch on which merging is performed in the same order as to master to protect against breakage from interdependency of branches not visible on devel because they've all been merged there. Or would such breakage simply not occur by always branching out feature and bugfix branches from master? Could be.

yarwelp commented 9 years ago

Or would such breakage simply not occur by always branching out feature and bugfix branches from master? Could be.

Not if I make multiple feature/bugfix branches all of which i want to work on and test at the same time. They will probably have to be merged into a development branch in the same order that they would be to master to ensure individual features and bugfixes wont behave differently when merged into master. Should probably merge from devel into master to also ensure that merging conflicts are resolved the same way on both devel and master.

yarwelp commented 9 years ago

Done. (Except I'm not going to do what I said about maintaining order.)