[wix-users] FW: using git

[Phill Hogland]

A while back I posted this question about using git and did not get any response.  I think my fork on the wix git site is messed up as described below, and I did not figure out how to recover from the situation (or possibly delete the fork), so I just set this issue to the side for a while.  I am looking for advice on how to solve this issue and then I would like to address WIXBUG 4932 followed by submitting some strings for some of the extensions that my company has had translated.

Thanks for any suggestions.
Phill

From: Phill Hogland
Sent: Friday, October 30, 2015 4:18 PM
To: 'WiX Toolset Developer Mailing List' <wix-devs at lists.wixtoolset.org>
Subject: using git


    I have been studying tutorials and experimenting with git as I try to make some simple changes to wix3 to submit some translated strings for various extension related to WIXBUG 4932.  But I think my problem is that last week I very confidently went through some git steps and committed changes, submitting a pull request, which I have since deleted.  Back then I apparently failed to update my fork and local branch before making the changes and pushing them up.  So the simple commit of 11 changes had 200+ changes and was a mess.



    Since then I have:

    Deleted the pull request.

    Deleted my local <feature> branch (several times, as I am getting good at making this change and finding problems with it, such as some files already go pushed up with all of the other junk, and others did not).

    My current goal is to get back to a 'clean' starting point.  I don't really care about keeping any of the changes.



    So recently I did:

    Git reset -hard <SHA> of earliest SHA as listed in git log.  Which worked and turned 'develop' from blue to red (I can guess what that means but not sure).

    I then tried to do:

    Git merge upstream/develop  But this returns fatal error - Updates were rejected because the tip of your current branch is behind its remote counterpart.



    I think that is because last week I did git push origin develop after making the changes incorrectly and not previously doing the git merge upstream/develop

    So at this point I don't care about any of my changes as I can recreate them easy enough.  I am just trying to get back to a clean starting point and I thing the problem is at the fork up on github, but I obviously have a lot to learn about this stuff.



    Thanks for any help!

    Phill