Say multiple branches are being developed,
B, as well as a incremental "bug fix" branch
C is already "finished" and merged into master.
B are still in development and will not be fixed before (maybe) another bug fix branch is merged into master.
Is it a good idea to merge
C as soon as possible in the new feature branches? So that the new features stay as close to
master as possible? Or is it better to let the new feature be developed in their own "world" only merging into master once they are finished?
There will be conflicts anyhow, so time needs to be spent on fixing those.