In the "You are updating the contrib code base" part, you should add the step where you're locally modify your code, config or composer.json.
Note that the "Someone else updated the contrib code base" part could also be used for deploy.
Another chapter about dealing with rebasing and merge conflicts could be really helpful.
Angebot innerhalb von 24 Stunden
Ob ein großes kommerzielles System, oder eine kleine Business Seite, wir schicken ein Angebot ab innerhalb von 24 Stunden nachdem Sie diese Taste drücken: Angebot anfordern
In the "You are updating the contrib code base" part, you should add the step where you're locally modify your code, config or composer.json.
Note that the "Someone else updated the contrib code base" part could also be used for deploy.
Another chapter about dealing with rebasing and merge conflicts could be really helpful.