If you have a branch with your own commits + commits you would like to be
merged upstream, the pull request feature will not work.
So the best way is to create a branch per bug/feature. And if you need the
interval feature, create a new branch and put all your commits in it. But
leave master as a clean reference.
lasconic
2013/9/15 The Monkowski Family <[email protected]>
> I did that, but now I don't see my changes on the master branch, and I
> don't want to do any other development on the Interval-guides branch. I
> want to start a new branch to do some unrelated bug fixes in, but I still
> want to see the interval guides functionality when I build. Seems like a
> merge is the only way to do that. Did I miss something?
>
> Mike
>
>
> On 9/14/2013 4:49 PM, Lasconic wrote:
>
>
>
>
> I'm fairly new to git. I've used it on an earlier project, but just to
>> get code, not to publish to it. I have created a branch in my GitHub
>> repository (user name MmAlder) for this feature so that anyone who is
>> interested can look at it. I then merged the branch back into my master
>> branch.
>
>
> You probably don't want to do this. It would be much easier if your
> master just follow MuseScore master.
> And you apply the master changes in your feature branch
>
>
>> If I understand correctly, this allows me to now create a new
>> branch for continued development that someone else can eventually pull
>> without getting the Interval Guides code, but the code still stays in my
>> master and I continue to see it in my local repository. Is that right?
>>
>
> No. I don't think so.
> What I would do is the following
>
> 1/ make sure that your master
> https://github.com/MmAlder/MuseScore/tree/master is identical to
> MuseScore master
> if you don't have MuseScore master as upstream run
>
> git remote add upstream git://github.com/musescore/MuseScore.git
>
> then do
>
> git fetch upstream
> git checkout master
> git reset --hard upstream/master
> git push origin master --force
>
>
> You should have your local master and your remote origin master identical
> to MuseScore master
>
> 2/then switch to your own feature branch
> git checkout Interval-guides
> git rebase master
>
> 3/And then when you want to get MuseScore changes run the following from
> time to time
> git checkout master
> git fetch upstream
> git merge upstream/master
> git checkout Interval-guides
> git rebase master
>
> Hope it makes sense.
>
> lasconic
>
>
>
>
> ------------------------------------------------------------------------------
> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8,
> SharePoint
> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack
> includes
> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
> http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
> _______________________________________________
> Mscore-developer mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/mscore-developer
>
>
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
_______________________________________________
Mscore-developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mscore-developer
