A question has surfaced on the team: would it be a good or a bad idea to have a script auto merge from master to all this release's branches on a daily basis?
I'm not entirely convinced by it -- it seems that merging may yield conflicts (and in that case the script would back-off), but even if it doesn't, I can imagine cases where I'm working on some huge refactor on my branch, by some reason I want to commit and push it and then it may so happen that I can't because the master has been changed in-between! In those (rare) cases I would be left with no option than to
git push --force or simply not push my changes.
What's your take on this? Are teams using these kinds of scripts elsewhere?