Thanks for all your help! Will experiment how it works best for me!
-Rui On Wed, Sep 23, 2020 at 12:06 PM Ruben Q L <rube...@gmail.com> wrote: > Rui, > I am not a git expert, but what I usually do in these cases is (working in > my local feature branch): > git rebase -i master > (editor will be opened, "pick" first commit, "squash" the rest; then edit > your final squashed commit message) > Then you can force push. In your PR it should appear 1 commit instead of N. > This is just one way to do it, if you search online, you'll probably find > better explanations than mine for this "git squash commits" operation. > > Best regards, > Ruben > > > > Le mer. 23 sept. 2020 à 19:50, Julian Hyde <jh...@apache.org> a écrit : > > > Feel free to experiment. If it creates a bad result - e.g. a merge > > commit, or does not squash - quickly back it out with a force push to > > master. > > > > Maybe I'm a git dinosaur, but I always use the command line to merge > > my own and others' changes. I don't trust the github UI to do exactly > > what I want. > > > > On Wed, Sep 23, 2020 at 11:45 AM Rui Wang <amaliu...@apache.org> wrote: > > > > > > Thanks Ruben for kicking off 1.26.0 release! > > > > > > Can I ask a question here: how can I squash commits to merge > > > https://github.com/apache/calcite/pull/2160? I am worried that if I > > click > > > the "rebase and merge", it will push two commits into the Calcite main > > > branch. > > > > > > > > > -Rui > > > > > > On Wed, Sep 23, 2020 at 11:38 AM Ruben Q L <rube...@gmail.com> wrote: > > > > > > > Hi all, > > > > > > > > It has been around one and a half months since our last release > > (1.25.0), > > > > and it seems a good moment to start discussing our next one 1.26.0. > > > > > > > > As we can see in our Jira dashboard [1] there are a few unresolved > > issues > > > > for 1.26. > > > > However, we have 180+ open pull requests [2], some of them seem in > good > > > > shape, even though their corresponding Jira tickets do not specify > > 1.26 as > > > > "fix version", so they do not appear in the Jira dashboard. I > encourage > > > > contributors to take a look at these open issues, in order to confirm > > what > > > > can / should be included in the next release. > > > > > > > > Ideally, I would like to generate a RC by the end of next week. > > > > > > > > Do not hesitate to reply to this thread if the plan above is not > > > > convenient for you. > > > > > > > > Best regards, > > > > Ruben > > > > > > > > [1] > > > > > > > https://issues.apache.org/jira/secure/Dashboard.jspa?selectPageId=12333950 > > > > [2] https://github.com/apache/calcite/pulls > > > > > > >
