[wix-devs] Help! Destabilized Repo

[Ron Martin]

The problem started when I tried to pull from upstream and wound up 
merging issue5371 into develop. At that point,
I could no longer check out develop. Things just got worse from there.

If I read the documentation correctly, I should be able to use git diff  
issue55371 > change.patch and git apply
change.patch (with appropriate paths) to save and restore my changes, 
respectively. There shouldn't be any
binary file changes.

How does that sound?

On 7/14/2021 11:56 AM, Hoover, Jacob via wix-devs wrote:
> If you somehow munged your develop branch on your fork, that implies you did some commits to develop.  If you create and push a new branch based off of develop, then you should be safe to go back to your develop branch, and do a hard rest prior to any of your changes.  From there you should be able to pull upstream changes and merge them in, getting back to a happy state.
>
> From: wix-devs <wix-devs-bounces at lists.wixtoolset.org> On Behalf Of Vilius Šumskas via wix-devs
> Sent: Wednesday, July 14, 2021 12:30 AM
> To: WiX Toolset Developer Mailing List <wix-devs at lists.wixtoolset.org>
> Cc: Vilius Šumskas <v.sumskas at advantes.tech>
> Subject: Re: [wix-devs] Help! Destabilized Repo
>
> Hi,
>
> you could probably use "git format-patch" to export your changes and then reapply them when a repo is fixed.
>
> --
> Vilius
>
> -----Original Message-----
> From: wix-devs <wix-devs-bounces at lists.wixtoolset.org<mailto:wix-devs-bounces at lists.wixtoolset.org>> On Behalf Of Ron Martin via wix-devs
> Sent: Wednesday, July 14, 2021 2:10 AM
> To: wix-devs <wix-devs at lists.wixtoolset.org<mailto:wix-devs at lists.wixtoolset.org>>
> Cc: Ron Martin <cpuwzd at comcast.net<mailto:cpuwzd at comcast.net>>
> Subject: [wix-devs] Help! Destabilized Repo
>
> Today, I managed to destabilize my repo, specifically my develop branch.
> The only way I know that I can fix
> it for sure would be to do a new fork, but that would destroy my
> Issue5371 branch, which is waiting on a
> pull request.
>
> I was wondering if you could create an Issue5371 branch of
> github.com/wixtoolset/wix4<http://github.com/wixtoolset/wix4> and pull my changes on this branch from github.com/cpuwzd/wix4<http://github.com/cpuwzd/wix4> before I lose all my work again.
>
> That should allow me to reconstruct everything at my end while we discuss my changes..
>
> Thanks.
>
> Ron
>
> ____________________________________________________________________
> 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.
> ____________________________________________________________________
> WiX Toolset Developer Mailing List provided by FireGiant http://www.firegiant.com/