[Debian-handbook-translators] Some comments after the first Git pushes of translators
Raphael Hertzog
hertzog at debian.org
Fri Jun 1 05:53:11 UTC 2012
Hello,
On Thu, 31 May 2012, Norman García Aguilar wrote:
> I change the branch to squeeze/master as you suggested, and I made my
> first commit to check everythin is fine, but when I make "git push" I
> have
>
> 4e02048..0fc6666 squeeze/master -> squeeze/master
> ! [rejected] master -> master (non-fast-forward)
> error: failed to push some refs to 'git+ssh://n0rman-guest@git.debian.org/git/debian-handbook/debian-handbook.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again. See the
> 'Note about fast-forwards' section of 'git push --help' for details.
>
> Looks like I'm having a problem :/ can you help me with this?
You have some non-pushed changes on the "master" branch. You might want to
verify what they are by doing "git log origin/master..master".
If they are not important, you can get rid of them by doing:
$ git checkout master
$ git reset --hard origin/master
Also you might want to configure "git push" to push only the current
branch to avoid pushing by mistakes some changes on other branches:
$ git config push.default upstream
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/
More information about the Debian-handbook-translators
mailing list