Hi Antonio, Am Montag, dem 06.03.2023 um 20:05 +0100 schrieb Antonio:
> It seems the Rust branch was not cleanly squashed and merged to master > (I used the Github's "Squash and Merge" button), so we ended up with > different commits in master. I think what we see is just an unsquashed merge. I come to this conclusion because I compared with my local branch, which I used to propose additional changes: 5fa12d488bbc112fd3bea66b1cb809788e01e750 my fourth proposed change is in both branches 41696a67e9e047dc9c5e281dc5a61d850b82beb6 fixes a problem I introduced fb0c60b52ab7dcd114b43c34ab155e9b1768de1e adds rust tests to CI/CD f09ba6dae8568240fc289fc926b98de4c8f48adc is merge commit There is no indication for unrelated changes. > Do we revert those commits in master? The rust addition could look nicer, but it is the reviewed state and the individual commits also look ok. I prefer sensibly squashed commits, because this makes it easier to see what was done, is easier to revert if necessary and history can be easier read. None of these goals is accomplished by reverting and reapplying squashed. So lets keep it as is, be happy with the rust additions and try to do better in the future. Matthias, Who yesterday realized, that he is fixing issues he introduced himself --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org For additional commands, e-mail: dev-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
