GL re-sends old notificaitons after merging branch with old commits
Vesion 10.4.2-ee
Folks, it maybe an edge case issue, or maybe I am doing something wrong..
When we have a branch
that's behind master
branch, to make this branch
it up to date, I do a local merge of master into this branch:
git checkout branch
git merge master
This makes branch up to date with master
(all commits from master
appear in branch history as well), but also updates issues that had been closed upon previous merge requests and re-sends old mentions notifications to team members. I.e. if there was a merge request or a commit comment in master
, once such merge / commit appears in branch
history and pushed back to server, people receive notifications about those mentions again.
For example, three closed issues were "updated" due to push of a branch that contains old merge commits from master:
Hope it makes sense. Is there a better way to catch up a temporary branch with master
? Or maybe there's some merge setting that I missed?
Cheers.