Yes, we should not force push. I'll create a new PR for reverting it. Thanks, Junichi On Thu, Jun 28, 2018 at 7:53 PM Tim Boudreau <[email protected]> wrote: > > Personally, I think revising history is somewhat evil, and disable it on my > own git servers. Usually it gets used just to turn a messy real history > into a lovely shining jewel that reflects well on the developer, but that's > mostly about ego and looking like you never make mistakes. There might be > a case for it if a bunch of commits implement a very specific feature, for > ease of understanding what code that feature affected - but this is more of > a random pile of stuff. > > At any rate, as a rule of thumb, IMHO: 1. never squash anything if there's > a possibility that someone else has a copy of the unsquashed version. 2. If > you want to do that to your own commits *before you've pushed them anywhere*, > fine. > > -Tim > > On Thu, Jun 28, 2018 at 1:21 AM Geertjan Wielenga > <[email protected]> wrote: > > > Apologies for doing it incorrectly, it's just the way I've been doing it > > all along. > > > > Agree with the idea of the committer committing her/his own work rather > > than someone else. > > > > Gj > > > > > > On Thu, Jun 28, 2018 at 7:08 AM, Matthias Bläsing < > > [email protected] > > > wrote: > > > > > Hey, > > > > > > in theory you could rewrite history and force push an update, but that > > > will break all commits on top of that. > > > > > > I would create a revert patch, that restores the branch to its previuos > > > state. History looks a bit more complicated after that, but that should > > not > > > break others work. > > > > > > In general I would prefer if a committer commits bis work himself. He > > > knows besteht how to handle it. Squash-and-merge is IMHO for corner cases > > > and not for general usw. > > > > > > Matthias > > > > > > Am 28. Juni 2018 05:20:14 MESZ schrieb Junichi Yamamoto < > > > [email protected]>: > > > >Hi, > > > > > > > >My backport of fixes made after Apr 22, 2017 was merged into > > > >2ndDonation branch[1]. However, it was squashed. I think that we > > > >should not squash it. > > > > > > > >Can someone undo this? > > > > > > > >[1] https://github.com/apache/incubator-netbeans/pull/607 > > > > > > > >Thanks, > > > >Junichi > > > > > > > >--------------------------------------------------------------------- > > > >To unsubscribe, e-mail: [email protected] > > > >For additional commands, e-mail: [email protected] > > > > > > > >For further information about the NetBeans mailing lists, visit: > > > >https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists > > > > > > -- > > > Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail > > > gesendet. > > > > > -- > http://timboudreau.com
--------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
