I believe a root cause of this breakage was the difficulty of merging
the docs from 2.9 to master.
The merge resulted in a bunch of awkward conflicts. As always, the
conflicts were caused by files being changed in the same place in both
branches. In this case, the conflicts came from a couple of misplaced
commits back in November:
8d07575ef31c0d99cd9601aabb90e5d59cea9ac5
c1668e209290693a086f99c039271a22bc5e9061
Those were big translation-motivated changes that mistakenly went into
master, when they should have gone into 2.9. (You can see that those
went into master instead of 2.9 using `git branch -a --contains $SHA` to
list all branches that have those commits in their history.)
Later, similar but slightly different translaton-motivated changes went
into 2.9, and the following merge stopped on the conflicts.
I think we now have a consensus in place that, generally, changes to
.adoc files go in 2.9 (unless they're describing new behavior in master,
of course), and all changes to .po/.pot files without exceptions go in
master.
Had we had this consensus in place back in November, the present merge
problem would have been much smaller.
Perhaps we should have a Github Action that warns on .adoc changes in
master or .po/.pot changes in 2.9?
--
Sebastian Kuzminsky
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
