this was clarified on XMPP but for other list subscribers who follow
along:
xin: > Branch feature/15292-usb-image was not merged into devel?
It was merged but a later buggy merge conflict resolution reverted
some doc & translation work: master had changes needed to get metrics
on our installation process, while testing had changes for the USB
image project; those changes conflicted in a way that was impossible
to resolve without understanding the reason behind each such change.
This is tracked as #16376.
In the future, it would be nice if tech writers merged master into
stable (→ testing, if frozen) → devel every time they merge stuff into
master: otherwise, all the doc work done on topic branches based on
stable/devel/testing is based on an obsolete version of our website,
which leads to two issues:
- hard to resolve merge conflicts, which the RM is not the best
placed to solve: as we can see here, sometimes we get it wrong
- translations done based on obsolete PO files, which can cause
useless work and again, hard to resolve merge conflicts and lost
work, as we can see on #16376 too: the USB image doc translation
was hard to merge with translation updates _independently_ done on
the master branch.
This gives tech writers responsibility of dealing with the merge
conflicts they generate, just like developers already have to ensure
their topic branch can be merged into the target branch without
conflicts (Jenkins tries to do that and fails the build if it can't).
The only exception would be during a release process, e.g. right now
pushing to the testing branch would break stuff.
sajolida, does this make sense to you? Seems doable?
