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?