Github includes the build directory. How do I stop that?
That's the top of the list of changed files in my master branch, which I just sync'd with the MuseScore master. What did I do wrong to get the build directory and all its sub-directories in this list?
What can I do now to eliminate them from the list?
Thanks...
Comments
as your build directory use build.debug, build.release or, in Windows, built.qtc as outlined in the developers' handbook. In GitHub Desktop for Windows, right click the items and then "Discard changes"
In reply to as your build directory use… by Jojo-Schmitz
I do that for debug, but I also setup a Release config that uses build. I was trying a lot of things at one point. I'll set a different dir for that config. That will solve it? That updates git automatically? I guess I'll find out.
In reply to I do that for debug, but I… by sideways
Use build.release then, not build. You still need to get rid of all the unwanted files in build though
In reply to Use build.release then, not… by Jojo-Schmitz
OK, build files removed, build dir maintained. I am seeing a bunch of files (132 of them) that are no longer in the master. I'll work to eliminate those too.
But my problem now is that I inadvertently committed my master with these additional files, and I am unable to reset everything and get resynchronized with musescore:master. Here is my master on github.com:
https://github.com/sidewayss/MuseScore/tree/master
It's 3 commits ahead. I have tried >git reset --hard upstream/master, and that seems to work on the client, but then sync'ing doesn't fix it on github. Any suggestions? It has been 2 years since I've monkeyed around with git, and my memory is slow to return.
Thanks!
In reply to OK, build files removed,… by sideways
git push - f
In reply to git push - f by Jojo-Schmitz
That worked. But goddammit, I had switched to my working branch in between my last post, and ended up wiping out all my changes from the past week! Oh well. It's recent work, I can reconstruct it in a few hours...
I forgot how careful you have to be with git.
In reply to git push - f by Jojo-Schmitz
Fortunately I had my changes as of my initial integration last week backed up locally. I spent a lot of the time since then screwing around with my build config, so not too many actual code changes earlier than yesterday. Yesterday is easy to remember. I'm almost all the way back with my working branch, and now it's perfectly clean as far as git is concerned, so that's a positive.
Permalinks I posted to other forum topics have given me access to code from one of my recent commits, which is a pleasant surprise. If I had all the commit ids I might be able to find the latest, even though I have overwritten it with git reset --hard followed by git push -f.
Anyway, I didn't want to end on a sour note.