fsateler at gmail.com
Wed May 6 03:29:48 UTC 2009
2009/5/6 Jaromír Mikeš <mira.mikes at seznam.cz>:
>> Od: Felipe Sateler <fsateler at gmail.com>
>> > I just noticed that there is new version of slv2 already 0.6.4 so I
>> > uploaded to git upgraded package.
>> > I created new repository slv2-0.6.4 for it.
>> > I had some errors when I tried upload it to slv2.git
>> Please try to solve these errors instead of bypassing them. Having one
>> repository for each version of a package beats the purpose of version
>> control, and also quickly becomes unmanageable. What errors did you
> $ git push alioth master
> To ssh://firstname.lastname@example.org/git/pkg-multimedia/slv2.git
> ! [rejected] master -> master (non-fast forward)
> error: failed to push some refs to 'ssh://email@example.com/git/pkg-multimedia/slv2.git'
> Sorry git is still a bit new for me.
This means that someone made some updates to the git repository in
between your last pull and your current push. The (non-fast forward)
bit is the key part. You have to resolve the(potential) conflict
manually. You can either try to rebase the changes, or merge them. You
should try to rebase if possible (if you haven't published your
changes elsewhere), but it is not always possible (git pull --rebase
tries to do this).
Please read the git users guide.
More information about the pkg-multimedia-maintainers