From: Daniel P. <dp...@gm...> - 2015-07-23 23:13:53
|
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 |