Disparity between master and develop
696 views
Skip to first unread message
Nathaniel Whiteinge
Sep 4, 2010, 10:03:41 PM9/4/10
to gitflow-users
We recently started using this gitflow workflow at my work. This week
during an emergency one of my coworkers made a couple commits directly
into master. What is the best or recommended way to get those changes
into develop -- just merge master into develop?
On a broader philosophical note, I don't fully understand why merging
master directly into develop isn't included in the regular workflow
(perhaps as part of the phase when you merge a release branch). It
seems to me that introduces the possibility of having master and
develop not exactly in sync for at least a while, especially if your
team tends not to do hotfixes very often.
After you merge a release branch into master, would there be any
difference if you merged master into develop *instead* of merging the
release branch into develop, or am I missing something subtle?
during an emergency one of my coworkers made a couple commits directly
into master. What is the best or recommended way to get those changes
into develop -- just merge master into develop?
On a broader philosophical note, I don't fully understand why merging
master directly into develop isn't included in the regular workflow
(perhaps as part of the phase when you merge a release branch). It
seems to me that introduces the possibility of having master and
develop not exactly in sync for at least a while, especially if your
team tends not to do hotfixes very often.
After you merge a release branch into master, would there be any
difference if you merged master into develop *instead* of merging the
release branch into develop, or am I missing something subtle?
Vincent Driessen
Sep 6, 2010, 5:01:24 AM9/6/10
to gitflo...@googlegroups.com
Hi Nathaniel,
We recently started using this gitflow workflow at my work. This week
during an emergency one of my coworkers made a couple commits directly
into master. What is the best or recommended way to get those changes
into develop -- just merge master into develop?
Using git-flow does not change much about the way you work with vanilla Git. It only automates certain actions for you, by following the rules from the branching model article. So it is perfectly safe to merge your changes from master into develop at any time if you wish to do so, git-flow won't nag about this in the future.
On a broader philosophical note, I don't fully understand why merging
master directly into develop isn't included in the regular workflow
(perhaps as part of the phase when you merge a release branch).
I acknowledge this as a shortcoming of the branching model. In the future, this will be the default behaviour (with an option to use the "old-style" merging). In fact, this has been discussed already, see these links:
Cheers,
Vincent
Robert Pollak
Jul 12, 2011, 5:45:21 PM7/12/11
to Vincent Driessen, gitflo...@googlegroups.com
> http://nvie.com/git-model#comment-72479067
Since this link does not work directly any more, here's the liked
comment (by Rubén Laguna) for the record:
> I started to use this model but then I found that git-describe will not work as I expected on the
> development branch as the tags are only in the master. In order to have a meaningful git-describe
> on develop what would be the best approach:
>
> 1. create the 1.2 tag in branch release-1.2 instead so when this branch is merged both to master
> and develop it will be "inherited" by both of them.
> 2. merge master into develop after creating the tag
> 3. create a dev1.2 tag in branch release-1.2 and a 1.2 in master
>
> Thanks in advance for your help
Reply all
Reply to author
Forward
0 new messages