MuseScore Developer

github and version control

Classic

List

Threaded

8 messages Options

cymro

github and version control

Hello I would appreciate some instructions / info using the GitHub app on how to create your own version of MS.
It really isn't clear to me what the principals are here.

I realise that you fork via GitHub and I do have a local copy of the code on my PC. However does this automatically sync with the master branch in the background?

I would like to have different versions of the code on my machine? e.g. if I am working on a particular bug (if I ever get that far!) or comparing different nightly builds etc. At the moment I can only figure out how to have one version as the GitHub app only seems to allow one version of the code on my computer?

Thanks everyone! look forward to your answers

Daniel

oberon

Re: github and version control

You need to read up on branches and on upstrem syncing.
You'll find tons of information on the Github help pages, on
stackoverflow and similar pages.

Have fun! ;)

On 31/12/16 00:39, cymro wrote:

> Hello I would appreciate some instructions / info using the GitHub app on how
> to create your own version of MS.
> It really isn't clear to me what the principals are here.
>
> I realise that you fork via GitHub and I do have a local copy of the code on
> my PC. However does this automatically sync with the master branch in the
> background?
>
> I would like to have different versions of the code on my machine? e.g. if I
> am working on a particular bug (if I ever get that far!) or comparing
> different nightly builds etc. At the moment I can only figure out how to
> have one version as the GitHub app only seems to allow one version of the
> code on my computer?
>
> Thanks everyone! look forward to your answers
>
> Daniel
>
>
>
> --
> View this message in context: http://dev-list.musescore.org/github-and-version-control-tp7580093.html
> Sent from the MuseScore Developer mailing list archive at Nabble.com.
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer

oberon

Re: github and version control

In reply to this post by cymro

Hi Daniel!
You will need to read up on branches and on upstream syncing.
You'll find tons of information on the Github help pages, on stackoverflow and similar pages. git might seems a bit intimidating in the beginning but it's really a wonderful tool!

Have fun! :)

Robert Patterson

Re: github and version control

Daniel,

Git is super easy once you get the hang of it. You will clone your own copy of the repo in github and make updates to your own branches in it. Then when you are ready to merge back to the production MS repo, you create a pull request in github.

Git encourages profligate branching because it is so good at merging. I recommend making a branch for anything you do. You might also want to get SourceTree, which gives you a nice gui on top of git. It will show you the branch history, and that may help you visualize how it works.

On Fri, Dec 30, 2016 at 6:13 PM, oberon <[hidden email]> wrote:

Hi Daniel!
You will need to read up on branches and on upstream syncing.
You'll find tons of information on the Github help pages, on stackoverflow
and similar pages. git might seems a bit intimidating in the beginning but
it's really a wonderful tool!

Have fun! :)

--
View this message in context: http://dev-list.musescore.org/github-and-version-control-tp7580093p7580094.html

Sent from the MuseScore Developer mailing list archive at Nabble.com.

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer

cymro

Re: github and version control

I don't know why it is so complicated - I'm used to using Source control as a developer but the tools that I have always used are much more straightforward - basically you just check out and check in the code.

sideways

Re: github and version control

Yes, but were you working on an open source project with all kinds of
branching happening? Git is the way it is today, so you might as well
get used to it. I have used other source control systems too, and yes,
they were simpler. But today everyone uses git, not just github. Once
you learn the basic command line, and maybe mix it a bit with the client
app, you'll be fine. Just stick to the instructions at musescore.org,
and try to stay away from rebasing, if you can...
__
Sideways

On 1/2/2017 6:24 AM, cymro wrote:

> I don't know why it is so complicated - I'm used to using Source control as a
> developer but the tools that I have always used are much more
> straightforward - basically you just check out and check in the code.
>
>
>
> --
> View this message in context: http://dev-list.musescore.org/github-and-version-control-tp7580093p7580105.html
> Sent from the MuseScore Developer mailing list archive at Nabble.com.
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer

Jojo-Schmitz

Re: github and version control

How could you stay away from rebasing? (I usually (and frequently) use 'git
pull --rebase upstream master'.

-----Original Message-----
From: Sideways Skullfinger [mailto:[hidden email]]
Sent: Monday, January 02, 2017 2:53 PM
To: [hidden email]
Subject: Re: [Mscore-developer] github and version control

Yes, but were you working on an open source project with all kinds of
branching happening? Git is the way it is today, so you might as well get
used to it. I have used other source control systems too, and yes, they
were simpler. But today everyone uses git, not just github. Once you learn
the basic command line, and maybe mix it a bit with the client app, you'll
be fine. Just stick to the instructions at musescore.org, and try to stay
away from rebasing, if you can...
__
Sideways

On 1/2/2017 6:24 AM, cymro wrote:

> I don't know why it is so complicated - I'm used to using Source
> control as a developer but the tools that I have always used are much
> more straightforward - basically you just check out and check in the code.
>
>
>
> --
> View this message in context:
> http://dev-list.musescore.org/github-and-version-control-tp7580093p758
> 0105.html Sent from the MuseScore Developer mailing list archive at
> Nabble.com.
>
> ----------------------------------------------------------------------
> -------- Check out the vibrant tech community on one of the world's
> most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer

----------------------------------------------------------------------------
--
Check out the vibrant tech community on one of the world's most engaging
tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mscore-developer mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/mscore-developer

sideways

Re: github and version control

I said "try to stay away", not "stay away". And I was half-joking, of
course, because beyond the basic rebase command you mention, rebasing
can be a real challenge, and it can require a lot of learning about git
and how it merges things. If your 'git rebase upstream master' fails
for any reason, then things get complicated. I've generally resorted to
manually updating files rather than learn everything required to make
git rebase handle it properly. And then there's the "whole removing
commits so that your PR only has one commit when you submit it" process,
which is less complex than it might appear at first...
__
Sideways

On 1/2/2017 10:11 AM, Joachim Schmitz wrote:

> How could you stay away from rebasing? (I usually (and frequently) use 'git
> pull --rebase upstream master'.
>
> -----Original Message-----
> From: Sideways Skullfinger [mailto:[hidden email]]
> Sent: Monday, January 02, 2017 2:53 PM
> To: [hidden email]
> Subject: Re: [Mscore-developer] github and version control
>
> Yes, but were you working on an open source project with all kinds of
> branching happening? Git is the way it is today, so you might as well get
> used to it. I have used other source control systems too, and yes, they
> were simpler. But today everyone uses git, not just github. Once you learn
> the basic command line, and maybe mix it a bit with the client app, you'll
> be fine. Just stick to the instructions at musescore.org, and try to stay
> away from rebasing, if you can...
> __
> Sideways
>
> On 1/2/2017 6:24 AM, cymro wrote:
>> I don't know why it is so complicated - I'm used to using Source
>> control as a developer but the tools that I have always used are much
>> more straightforward - basically you just check out and check in the code.
>>
>>
>>
>> --
>> View this message in context:
>> http://dev-list.musescore.org/github-and-version-control-tp7580093p758
>> 0105.html Sent from the MuseScore Developer mailing list archive at
>> Nabble.com.
>>
>> ----------------------------------------------------------------------
>> -------- Check out the vibrant tech community on one of the world's
>> most engaging tech sites, SlashDot.org! http://sdm.link/slashdot
>> _______________________________________________
>> Mscore-developer mailing list
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/mscore-developer
>
>
> ----------------------------------------------------------------------------
> --
> Check out the vibrant tech community on one of the world's most engaging
> tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer