geode-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dave Barnes <dbar...@pivotal.io>
Subject Re: Rebase and squash before merging PRs
Date Fri, 06 Oct 2017 00:20:02 GMT
Jake,
Say I have a PR with the original commit plus two more to incorporate
reviewer suggestions. How is it possible within the github UI to just
rebase without also merging? I don't see that choice in the gitbox pulldown
menu.

On Thu, Oct 5, 2017 at 4:59 PM, Jacob Barrett <jbarrett@pivotal.io> wrote:

> If you want to preserve all commits use rebase and merge. If you want a
> single commit then use squash and merge, which rebases, squashes, and
> merges. Both options update the commit info with the person performing the
> merge.
>
> Personally though I think you should be asking contributors to rebase
> before you accept their pull so you know it has been vetted agains the
> latest develop changes. As committer you shouldn’t have to resolve a
> submitters trash. This makes merging safe too.
>
> -Jake
>
>
> > On Oct 5, 2017, at 4:32 PM, Nick Reich <nreich@pivotal.io> wrote:
> >
> > Here are the docs from github:
> > https://help.github.com/articles/about-pull-request-merges/
> >
> > Based on those and using squash and commit for some of my merges, it
> looks
> > like it does what we want: just one commit for the merge of the feature
> > branch. Note that "rebase and merge" in github does not actually work
> > exactly like it does in git (see above link).
> >
> >> On Thu, Oct 5, 2017 at 4:15 PM, Jared Stewart <jstewart@pivotal.io>
> wrote:
> >>
> >> Does anyone happen to know if “squash and merge” also does a rebase or
> >> not? I’ve been hesitant to use that button since I’m not sure what exact
> >> sequence of git commands it corresponds to.
> >>
> >>> On Oct 5, 2017, at 3:59 PM, Jason Huynh <jhuynh@pivotal.io> wrote:
> >>>
> >>> I think we can also use "squash and merge" if wanting to squash commits
> >>> before merging.  This would allow you not to have to force push every
> >> time.
> >>>
> >>>> On Thu, Oct 5, 2017 at 3:15 PM Jinmei Liao <jiliao@pivotal.io>
wrote:
> >>>>
> >>>> On the PR UI page, you can do that by pull down the the menu when you
> >> are
> >>>> ready to merge. Remember to use "Rebase and merge".
> >>>>
> >>>>
> >>>> ​
> >>>>
> >>>> Not sure if this is useful to everyone, but when I push a subsequent
> >> commit to my feature branch, I always use "force push", so that it's
> only
> >> one commit I need to rebase to develop.
> >>>>
> >>>>
> >>>> On Thu, Oct 5, 2017 at 3:00 PM, Jared Stewart <jstewart@pivotal.io>
> >> wrote:
> >>>>
> >>>>> I’ve been seeing a lot more merge commits on develop since we
moved
> to
> >>>>> Gitbox.  Just wanted to give everyone a friendly reminder to please
> >> rebase
> >>>>> before merging to keep our git history tidy and readable.
> >>>>>
> >>>>> Thanks,
> >>>>> Jared
> >>>>
> >>>>
> >>>>
> >>>>
> >>>> --
> >>>> Cheers
> >>>>
> >>>> Jinmei
> >>>>
> >>
> >>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message