|
From: Alexander S. <aso...@gm...> - 2015-04-07 06:12:55
|
Jan, I don't know how Nikolay does it, but I simply download and apply the diff, and then run `git svn dcommit`. I know that you can also accept the pull request into a custom branch (i.e. non-master). In this case you can do it via GitHub's UI, and then rebase that branch on top of master and push changes. Kirill, by "branching hell" I meant non-linear history with a lot of "merge" points. You not only loose the linearity, but also the merge conflict resolution becomes way more complex, the chance to accidentally drop someone else's changes increases. I do know about variety of git workflows and different techniques of accepting new commits, and I'm not going to argue, I just wanted to share my experience. On Tue, Apr 7, 2015 at 1:47 AM, Kirill Katsnelson <kir...@sm...> wrote: >> -----Original Message----- >> From: Daniel Povey [mailto:dp...@gm...] >> Perhaps you could explain how this is done? >> It might help us make an informed decision if you could give us some >> details on the workflow that you use, at the level of specific >> commands. > > Let me set up a pair of cloned demo repositories to show different practices, as time permits. Give me a day or two. > > -kkm > ------------------------------------------------------------------------------ > BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT > Develop your own process in accordance with the BPMN 2 standard > Learn Process modeling best practices with Bonita BPM through live exercises > http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_ > source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF > _______________________________________________ > Kaldi-developers mailing list > Kal...@li... > https://lists.sourceforge.net/lists/listinfo/kaldi-developers -- Sincerely, Alexander |