On Fri, May 17, 2019 at 9:56 AM Bishop Bettini <email@example.com> wrote:
> Our Git FAQ currently says (at the bottom):
> > What about commits that should not be merged upwards (say, only for 5.3)?
> Should you still merge them but make it so no changes actually take place?
> Otherwise, it will the next person merging that will have to deal with the
> conflict (or worse, the changes will be merged when they shouldn't have
> Please, could someone supply examples as to when this scenario occurs, and
> how to handle it?
> I routinely do this for version commits on my release branch.