[wix-devs] Pull Request Question

[Vilius Šumskas]

Just a note, that by default upstream project has write permissions on the PR branch in the contributor's fork. If you need to edit any of the commits you can always push more changes to fork's branch and then Squash and Merge.

-- 
    Vilius

-----Original Message-----
From: wix-devs <wix-devs-bounces at lists.wixtoolset.org> On Behalf Of Bob Arnson via wix-devs
Sent: Friday, March 25, 2022 12:52 AM
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Cc: Bob Arnson <bob at firegiant.com>
Subject: Re: [wix-devs] Pull Request Question

I made a fix to the documentation and squashed as requested. That means the PR rebase wasn't available.

-----Original Message-----
From: wix-devs <wix-devs-bounces at lists.wixtoolset.org> On Behalf Of Sean Hall via wix-devs
Sent: Thursday, 24 March, 2022 18:23
To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
Cc: Sean Hall <r.sean.hall at gmail.com>
Subject: Re: [wix-devs] Pull Request Question

I was hoping Bob would respond since he was the one that handled the PR but I guess that's not happening.

Back when we were merging most of the v3.x PRs, Github didn't support anything other than a merge. We prefer a linear history, so we always merged PRs like this - rebasing and squashing onto the latest commit of develop. The most recent like this was https://github.com/wixtoolset/wix3/pull/492. In git, the original contributor would have credit in the Author field and the person who merged it would be in the Committer field.

In this specific scenario, it appears that Bob somehow squashed and rebased without keeping Christopher as the Author. I don't know how that happened, and it shouldn't have been done that way. I didn't look if he made any changes, but if he didn't he should have been able to use Github's new squash and rebase functionality.

On Thu, Mar 24, 2022 at 5:06 PM hymccord via wix-devs < wix-devs at lists.wixtoolset.org> wrote:

> Even if it was squashed, the PR would still be marked as a purple merged.
>
> I’m with Chris on this, the PR shouldn’t have been closed in the way 
> it was. It basically excludes him from showing as the contributor.
> Previous PRs haven’t been merged this way.
>
> > On Mar 24, 2022, at 4:13 PM, Hoover, Jacob via wix-devs <
> wix-devs at lists.wixtoolset.org> wrote:
> >
> > If it was squash merged, then it would have combined all your 
> > commits
> into a single commit (with a new hash).
> >
> >
> > From: Christopher Painter <chrpai at iswix.com>
> > Sent: Thursday, March 24, 2022 1:46 PM
> > To: Hoover, Jacob <Jacob.Hoover at greenheck.com>; WiX Toolset 
> > Developer
> Mailing List <wix-devs at lists.wixtoolset.org>
> > Subject: Re: Pull Request Question
> >
> > It's not the hash from my PR and my PR doesn't indicate it was merged.
> > ________________________________
> > From: Hoover, Jacob <Jacob.Hoover at greenheck.com<mailto:
> Jacob.Hoover at greenheck.com>>
> > Sent: Thursday, March 24, 2022 1:44 PM
> > To: WiX Toolset Developer Mailing List 
> > <wix-devs at lists.wixtoolset.org
> <mailto:wix-devs at lists.wixtoolset.org>>
> > Cc: Christopher Painter <chrpai at iswix.com<mailto:chrpai at iswix.com>>
> > Subject: RE: Pull Request Question
> >
> >
> > Bob's comment on the PR has a closed via (hash), which links to:
> https://github.com/wixtoolset/wix3/commit/9871b1061484ea2d8d1a0e4ea08a
> e6ce5f064c71
> <
> https://github.com/wixtoolset/wix3/commit/9871b1061484ea2d8d1a0e4ea08a
> e6ce5f064c71
> >
> >
> >
> >
> > Is that not the expected change?
> >
> >
> >
> > From: wix-devs <wix-devs-bounces at lists.wixtoolset.org<mailto:
> wix-devs-bounces at lists.wixtoolset.org>> On Behalf Of Christopher 
> Painter via wix-devs
> > Sent: Saturday, March 19, 2022 7:58 PM
> > To: WiX Toolset Developer Mailing List 
> > <wix-devs at lists.wixtoolset.org
> <mailto:wix-devs at lists.wixtoolset.org>>
> > Cc: Christopher Painter <chrpai at iswix.com<mailto:chrpai at iswix.com>>
> > Subject: Re: [wix-devs] Pull Request Question
> >
> >
> >
> > Is this just what squashing does? Sorry if I'm jumping to conclusions.
> > ________________________________
> > From: wix-devs <wix-devs-bounces at lists.wixtoolset.org<mailto:
> wix-devs-bounces at lists.wixtoolset.org>> on behalf of Christopher 
> Painter via wix-devs <wix-devs at lists.wixtoolset.org<mailto:
> wix-devs at lists.wixtoolset.org>>
> > Sent: Saturday, March 19, 2022 7:53 PM
> > To: WiX Toolset Developer Mailing List 
> > <wix-devs at lists.wixtoolset.org
> <mailto:wix-devs at lists.wixtoolset.org>>
> > Cc: Christopher Painter <chrpai at iswix.com<mailto:chrpai at iswix.com>>
> > Subject: [wix-devs] Pull Request Question
> >
> > So I took on an issue and submitted a PR:
> >
> > https://github.com/wixtoolset/wix3/pull/542<
> https://github.com/wixtoolset/wix3/pull/542>
> >
> > This issue and PR was closed and I don't show in the commit history
> because my PR wasn't actually merged. It's like my work was ignored or 
> just taken without credit.
> >
> > Was there something wrong with my code? Have I missed anything? I 
> > see
> other people in the commit history other than the three main people so 
> I don't think this is always the pattern.
> > ____________________________________________________________________
> > WiX Toolset Developer Mailing List provided by FireGiant
> http://www.firegiant.com/<http://www.firegiant.com>
> > ____________________________________________________________________
> > WiX Toolset Developer Mailing List provided by FireGiant
> http://www.firegiant.com/<http://www.firegiant.com/>
> >
> > NOTE: This email was received from an external source. Please use
> caution when opening links or attachments in the message.
> > NOTE: This email was received from an external source. Please use
> caution when opening links or attachments in the message.
> > ____________________________________________________________________
> > WiX Toolset Developer Mailing List provided by FireGiant
> http://www.firegiant.com/
> ____________________________________________________________________
> WiX Toolset Developer Mailing List provided by FireGiant 
> http://www.firegiant.com/
>
____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/ ____________________________________________________________________
WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/