w3c / PWETF

Positive Work Environment Community Group
https://www.w3.org/community/pwe/
Other
108 stars 55 forks source link

Lost changes during merge commit #311

Closed fantasai closed 1 year ago

fantasai commented 1 year ago

The changes from https://github.com/w3c/PWETF/pull/117 (see commit 756e08d) which was successfully merged after much discussion got blown out by conflict resolution in a merge commit (see e437360) which pulled a change on the same line (see 58a64d1) and resolved it in a way that lost the textual changes. Unclear how to restore the text, since it has evolved further since...