Github & Nightly Builds
Sorry, this has probably been asked but I can't find it:
If I clone MuseScore Master & keep synced with it, am I getting what the Nightly Builds are building?
I'm using GitHub's Windows GUI to clone to my local machine to build after I clone within my GitHub account.
Thanks.
Comments
Yes you are, assuming you are using the same Qt version that is used for the nightly builds. For Windows, that is 5.4.1 - very important in order to get a couple of significant fixes for Windows.
In reply to Yes you are, assuming you are by Marc Sabatella
Yes, I am using QT 5.4.1. I just checked to be sure with the Maintenance Tool although I'm going to go through the setup procedure again to double check my work.
Actually GitHub calls what I did a Fork but I think it's the same thing as Cloning but they call it a fork if it's done and resides on the GitHub servers.
Thanks.
In reply to Yes, I am using QT 5.4.1. I by JackJura
You fork on GitHub and than clone that to your machine :-)
Make sure you follow http://musescore.org/en/developers-handbook/compilation/compile-instruc… and you will succeede...
In reply to You fork on GitHub and than by Jojo-Schmitz
The part you will not be able to do with the GitHub UI as far as I know is to keep the sync between MuseScore master (upstream remote) and your own fork (origin remote). GitHub UI doesn't support multiple remotes (see https://help.github.com/articles/does-github-for-windows-support-multip…).
The "Sync" button or menu you see in github UI just push your local changes to your fork on github.com if I understand this correctly: https://help.github.com/articles/synchronizing-repositories/
So this part you will need to do manually in a good old command line like most of us do.
https://help.github.com/articles/syncing-a-fork/
Or use another git UI such as SourceTree (but I believe no other MuseScore developers will be able to help much)
In reply to The part you will not be able by [DELETED] 5
Fotr that you'd need GitHub for Windows, "Open in Git Shell"
git fetch upstream
git rebase upstream/master
As of the newest GitHub for Windows you can created PRs directly.
In reply to Fotr that you'd need GitHub by Jojo-Schmitz
I set my GitHub for Windows shell to Bash.
What I have
Nightly Build (Github) master->Nightly Build (Github) fork->Nightly Build(Local Computer) clone->Hobby Build(Local Computer) clone of clone
So when I start making experimental changes I will make them in my clone-clone but so that MuseScore stays working for me I will sync and merge the fork & the clone to built as the nightly build. Sometimes I might have to merge some of clone changes into clone-clone by hand.
Is it correct that GitHub automatically keeps my MuseScore fork current with the original MuseScore fork if I don't push any changes from my clone into my fork?
If I ever do any thing interesting or fix bugs in clone-clone I will show you for evaluation.
Thank you all.
In reply to I set my GitHub for Windows by JackJura
Github-MuseScore-musescore is the upstream
GitHub-YourName-musescore is the fork
You clone that fork to your PC using GitHub for Windows
GitHub for Windows only syncs between your fork (on GitHub) and your clone (on your PC).
To sync with upstream, you need the commands I listed above.
In reply to I set my GitHub for Windows by JackJura
Is it correct that GitHub automatically keeps my MuseScore fork current with the original MuseScore fork if I don't push any changes from my clone into my fork?
No. Github doesn't do that automatically. It's exactly what Jojo and I explained a bit before.
MuseScore master repository is at https://github.com/musescore/MuseScore. We call it the "upstream" remote. Your fork is on GitHub at https://github.com/yourusername/MuseScore. We call this the "origin" remote. Your local copy on your computer is a copy of the origin remote. In order to keep it in sync you need to manually fetch and merge the code from the upstream remote and push the result to your origin remote as explained by Jojo.
PS: it would make things so much easier if your username on musescore was the same than the one on github...
In reply to Is it correct that GitHub by [DELETED] 5
Thank you all. I understand now. I will change my username on GitHub to JAGrogan.
In reply to Thank you all. I understand by JackJura
Also I believe with the new GitHub for Windows (which I got offered today) you could merge upstream/master via the GUI, but that is to be avoided, you'd need to rebase. And for that you'd need to delve into the command line at times... you'd need to for conflicts anyway, but those shouldn't happen as long as you're not change code yourself
In reply to Also I believe with the new by Jojo-Schmitz
Thanks. I changed my user names to match on GitHub & MuseScore. My real name was already taken so I made up one. :-(
In reply to Thanks. I changed my user by JackJura
OK, so I got the Nightly Build local clones working and as of 2015 Mar 05 what I fetched & rebased from MuseScore master no longer has the build problems in QT Creator on Windows 8.1 64 bit.
Thank you all very much.