Tutorials

as it was from the maintainer for the previous version

@fberlakovich this will be interesting for you too, @easyxtarget please put that info also in the tutorial
I think it has to be the maintainers file, because otherwise we risk that the maintainers option will be used in the second upgrade without conflict, e.g.:

a maintainer provides the key:
        user/key = 20

we then modify it to:
         user/key = 50

base is 20, theirs is 20, but ours is 50: so we do not have a confict and get 50

but when we update the next base to:

           user/key = 50

in the next upgrade following might happen:

We do not modify our key, so ours and base is:

           user/key = 50

but lets say the maintainer changes it to 30

           user/key = 30

then our change would be silently overwritten, which is not a good idea.

So the base always has to be the previous version of the maintainers. What do you think?