intrigeri: > 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.
Sorry for creating this mess :(
> 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
>
> [...]
>
> sajolida, does this make sense to you? Seems doable?
Yep. Until now I was reluctant to do anything on stable/testing/devel
myself but this makes sense.
I might need help to remember though, so next time RMs see a complicated
merge conflict you can tell me and I'll fix it myself.
