3 Replies Latest reply on Jun 14, 2011 10:10 AM by Brian Leathem

    No-fast-forward merges of feature branches into develop

    Lukáš Fryč Master

      One more issue regarding to new flow which has been discussed on meeting [1] was using no-fast-forward feature merges with develop (discussed in section Incorporating a finished feature on develop in [2]). This goes with deleting feature branch right after merging and resolving the issue. New issue needs to be opened for fixing a feature.

       

      This is leading to clearer history and you are able to track features and fixes clearly using JIRA issues.

       

       

      The second issue is collaboration on features in personal repositories (e.g. on GitHub), there is better to rebase on work of each other and then, after finishing some part of work, you can push to your personal repository, giving others chance to rebase your changes and continue with your work.

       

      [1] http://community.jboss.org/wiki/RichFacesGitWorkflowModel

      [2] http://nvie.com/posts/a-successful-git-branching-model/