From: Jan T. <jt...@gm...> - 2015-07-23 23:27:37
|
There is github doc that does the same (using fetch and merge) https://help.github.com/articles/syncing-a-fork/ y. On Thu, Jul 23, 2015 at 7:24 PM, Jan Trmal <jt...@gm...> wrote: > I usually do > git checkout master # just to be sure I'm on master > git pull upstream master # that will do fetch & merge > > # you can do also git pull --all which should give you also all branches, > but that I dont use. > > y. > > On Thu, Jul 23, 2015 at 7:13 PM, Daniel Povey <dp...@gm...> wrote: > >> I'm sure someone on this list will be able to answer this easily, >> Suppose I have my own clone of kaldi-asr/kaldi.git at Sourceforge, as >> danielpovey/kaldi.git, and have checked it out using >> git clone gi...@gi...:/danielpovey/kaldi.git >> Suppose I then set the official kaldi-asr as the upstream, by doing >> git remote add upstream gi...@gi...:/kaldi-asr/kaldi.git >> so that >> git remote -vv >> shows me >> git remote -vv >> origin gi...@gi...:/danpovey/kaldi.git (fetch) >> origin gi...@gi...:/danpovey/kaldi.git (push) >> upstream gi...@gi...:/kaldi-asr/kaldi.git (fetch) >> upstream gi...@gi...:/kaldi-asr/kaldi.git (push) >> >> Then how do I merge changes from the upstream? >> We should have instructions on this somewhere. >> Dan >> >> >> >> >> ------------------------------------------------------------------------------ >> >> _______________________________________________ >> Kaldi-developers mailing list >> Kal...@li... >> https://lists.sourceforge.net/lists/listinfo/kaldi-developers >> >> > |