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:[email protected]] > Sent: Monday, January 02, 2017 2:53 PM > To: [email protected] > 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 >> [email protected] >> 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 > [email protected] > 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 > [email protected] > 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 [email protected] https://lists.sourceforge.net/lists/listinfo/mscore-developer
