Re: [Ubuntu] git push fails

2016-11-25 Thread Martin Landa
Hi, 2016-11-25 17:34 GMT+01:00 Sebastiaan Couwenberg : > I've fixed it on the trusty & xenial branches, and pushed the commits to > Alioth. Don't forget to pull the changes to have those commits in your > working copy before you make new changes, to prevent the need to rebase. Ok, thanks. I will

Re: [Ubuntu] git push fails

2016-11-25 Thread Sebastiaan Couwenberg
On 11/25/2016 12:50 PM, Martin Landa wrote: > 2016-11-25 12:15 GMT+01:00 Sebastiaan Couwenberg : >> There are commits on the branch that you haven't pulled into your >> working copy. You can fix it by rebasing your branch: >> >> git pull --rebase > > thanks for explanation, I have update GRASS co

Re: [Ubuntu] git push fails

2016-11-25 Thread Martin Landa
Hi, 2016-11-25 12:15 GMT+01:00 Sebastiaan Couwenberg : > There are commits on the branch that you haven't pulled into your > working copy. You can fix it by rebasing your branch: > > git pull --rebase thanks for explanation, I have update GRASS cookbook accordingly. Martin -- Martin Landa http

Re: [Ubuntu] git push fails

2016-11-25 Thread Sebastiaan Couwenberg
On 11/25/2016 12:12 PM, Martin Landa wrote: > when building GRASS packages for Launchpad [1] I have problem with > > git push --all --set-upstream > > which fails with > > Branch vdigit set up to track remote branch vdigit from origin. > error: failed to push some refs to > 'git+ssh://martinl-gu

[Ubuntu] git push fails

2016-11-25 Thread Martin Landa
Hi, when building GRASS packages for Launchpad [1] I have problem with git push --all --set-upstream which fails with Branch vdigit set up to track remote branch vdigit from origin. error: failed to push some refs to 'git+ssh://martinl-gu...@git.debian.org/git/pkg-grass/grass.git' hint: Updates