How to notify a developer when merge overridden their changes

Roman Gelfand_sf3mqn

I have a hotfix and release branches.   The hotfix branch is being periodically merged into release branch but not vice versa.  

 

The problem is when somebody makes a change to a source in hotfix branch after somebody changed it in release branch.  The hotfix branch will not pick up that change.

 

What are the remedies?

I was thinking that a developer that made the changes in release should notified that their changes have been overlayed when hotfix branch is merged into release branch.

 

Jimmy Seddon

Hi @Roman Gelfand,

Welcome to the Community!

First, question I have is what source control tool are you using?  I'm asking this because the best strategy depends on what you are using.  If you are using Git, I'll start by putting this link here: https://nvie.com/posts/a-successful-git-branching-model/

This is what I have based our company branching model on for the past 5 years and we have found it working flawlessly.

As a general rule for us the person who makes the change in the hotfix is responsible for making a pull request to bring that same change into the release branch.

We don't keep hotfix branches around, they get thrown away the moment the hotfix has been released to production and the changes have been merged into the release branch.  If we need to perform another hotfix in the future we will create a new branch from the master branch as needed.

I hope that helps answer your question.

-James