thx for these tips nathan !
Le 02/05/2013 11:30, Nathan Woodrow a écrit :
Generally you should work and push branches to github and issue pull
requests on those. It will make it easier to keep your pending commits
and changes out of your master branch so you can update it like normal
git checkout -b mywork
do you stuff..
git commit -m "My changes"
git push origin mywork
Pull request on mywork branch.
You can then keep master in line by doing:
git checkout master
git pull --rebase upstream/master
upstream == QGIS github repo, might be different for you.
- Nathan
On Thu, May 2, 2013 at 7:03 PM, 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
