[dev] How to deal with changelog/metadata in pull requests

[Ralf Lang]

Hello,

Am 29.07.20 um 20:01 schrieb Ralf Lang:
> Hallo,
>
> recently I picked up some overdue work on horde things. Basically the
> process is always the same: Before I can start doing anything useful, I
> have to update my fork (which is OK) and then resolve merge conflicts
> for changelog, composer.json, package.xml ... metadata
> Very rarely I get a conflict on actual lines of code (which would be
> perfectly normal and OK).
>
> Here is what I am currently trying:
>
> - Code commits happen on a separate branch
> - Metadata which I need to handle to get my things run is part of a
> separate throw-away branch on top.
> - Merge Requests/Pull Requests are initiated from the bare branch
> - Metadata and changelog are either not generated or only after
> agreement with upstream and hopes for a fast merge
>
> This way I hope to save time, remove annoying merge warnings in pull
> request screens and hopefully be more productive overall. My team will
> come up with some automation for the trivial cases and some automated
> notification for cases which require attention (code conflicts).
>
> Is there any easy way around which I may have overlooked? I could resort
> to force pushes as a habit but I rather wouldn't.
We have implemented that and the first PR from the new "bare" branch is 
coming.
>
-- 
Ralf Lang
Linux Consultant / Developer
Tel.: +49-170-6381563
Mail: lang at b1-systems.de
B1 Systems GmbH
Osterfeldstraße 7 / 85088 Vohburg / http://www.b1-systems.de
GF: Ralph Dehner / Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537