When trying to follow the the gitflow model, we have a branch for the releases.  However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from this.What are we doing wrong and how do we keep these merge bugs from showing up?Our git tree looks like:d  r  m|  |  |o  |  ||\ |  || \|  ||  1  |o  |  ||  2  ||  |  |o  3  || /|\ ||/ | \|o  |  4|\ |  || \|  ||  5  |where the o is a change on the development branch.  1 is where the development branch was merged into release, 2 and 3 are commits to fix bugs in the release branch, and then 4 is the release on master.  This then continues with 5 being the merge of development into the release branch again.
Bugs showing up with merge on the release branch
git;branching;gitflow