I've the same process/repo names than described on your blog, the
exception is 'git pull --rebase upstream master'. You're using it before
or after a add/commit ?
Le 02/05/2013 14:48, Werner Macho a écrit :
Hi JR
It all depends how YOU called your "upstream" .. your fork on github
after cloning is always called "origin" ..
The rest depends which repository you cloned and which one is the remote
attached ..
You can take a look at:
http://quantumofgis.blogspot.co.at/
there i explained "my" workflow for translations ..
I will extend that with a GRASS entry in the next few weeks too - and
afterwards I'll move to branching and merging explanations .. :)
git is not THAT difficult once you are used to it ..
regards
Werner
On Thu, May 2, 2013 at 11:03 AM, MORREALE Jean Roc
<[email protected] <mailto:[email protected]>> wrote:
Hi Werner,
Thank for the answer, I already tried git reset but got stuck on that :
$ git reset --hard upstream/master
fatal: ambiguous argument 'upstream/master': unknown revision or
path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
But applying the command 'git remote update' before it did the trick !
I didn't knew this command, should it be used instead of fetch/pull
upstream ?
_______________________________________________
Qgis-developer mailing list
[email protected]
http://lists.osgeo.org/mailman/listinfo/qgis-developer
