On 10/11/2016 03:11 PM, Petr Vobornik wrote:
Hi List,
we discussed locally a proposal about creating a feature branch for each
sub-team effort in our main git. Currently it would be for the 4 ongoing
refactoring efforts + Simo's work
Why?
It will allow each developer to create a pull request against the
feature branch and thus it will enable iterative development by multiple
devs without affecting other sub-teams. When the feature(refactoring) is
finished, the branch would be rebased on master and merged there. Note:
rebases can be done as needed - e.g. when other subteam finishes its work.
Concerns:
1. Upstream git repo would be full of such branches.
- This can be mitigated by deleting the feature branches when their are
released or merged(up to discussion)
2. Too big traffic on a list.
- IMO we actually want it - progress will be visible to others
Naming:
I propose:
refactoring-XXX
feature-XXX
Thoughts? Anyone against?
Hi,
I think feature branches are a good idea. Once they're merged, I would
delete them.
I'm for the refactoring-XXX naming convention.
--
Tomas Krizek
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code