[Development] [IMPORTANT] your commits in stable branch perhaps lost after dev branch merged
oswald.buddenhagen at digia.com
Thu Mar 21 20:27:33 CET 2013
On Thu, Mar 21, 2013 at 02:33:30PM +0000, Qi Liang wrote:
> I think it's important, your commits in stable branch perhaps lost
> after dev branch merged. [...]
to preclude further pointless panicking, i simply re-did the merge
and diffed the result.
the hunk that was already identified as lost was indeed a simple
i also identified a second commit which appears to have been mis-merged
(comment added to original change).
the merge was originally done by sergio (who also introduced the
mistakes, which is somewhat understandable, given how many merges there
were to do, and under which (perceived) time pressure).
i amended and "rebased" the merge, and in the process accidentally
"stole" the attribution. later i reviewed the merge and missed the
mis-merges (mostly due to git's retarded (non-)display of conflict
end of story. now move on.
More information about the Development