hi -

i fixed a small typo in arrays.c but now i have problems to push it. my 
guess is that i committed my change internally on the master branch. is 
there any way to change it to the develop branch?

my git dialog is below. thanks for any help -

	joachim


jh@lenov:~/src/csound6-git$ git branch
* develop
   feature/udo_type_system
   master

jh@lenov:~/src/csound6-git$ git pull
WARNING: gnome-keyring:: couldn't connect to: 
/tmp/keyring-kNZEH5/pkcs11: No such file or directory
Already up-to-date.

jh@lenov:~/src/csound6-git$ git log
commit f7a665a5227e34eed13408366f9c006734039e9d
Author: joachim heintz 
Date:   Fri Apr 18 15:03:24 2014 +0200

     fixed a typo in arrays.c (minarray1)

commit 0f4cd1bf5a04f66b3945855e13a401824a09d43c
Author: Steven Yi 
Date:   Thu Apr 17 18:52:43 2014 -0400

     added CsoundObj.js

commit a6e068d1f7a6bb3c8fb5c2761d974c1e05a92bdd
Author: Steven Yi 
Date:   Thu Apr 17 18:46:38 2014 -0400

     another fix for Emscripten

commit 1571643da849e773c6bc604dd41d585980876612
Author: Steven Yi 
Date:   Thu Apr 17 18:31:22 2014 -0400

     finished emscripten build script, added CsoundObj.c src

jh@lenov:~/src/csound6-git$ git push
WARNING: gnome-keyring:: couldn't connect to: 
/tmp/keyring-kNZEH5/pkcs11: No such file or directory
To https://github.com/csound/csound.git
  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/csound/csound.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.

jh@lenov:~/src/csound6-git$ git push origin develop
WARNING: gnome-keyring:: couldn't connect to: 
/tmp/keyring-kNZEH5/pkcs11: No such file or directory
Everything up-to-date

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Hi Joachim,

My guess is your push default is set to something other than just the
current branch. Check this with:

git config -l

I have:

push.default=current

here.  I have that set in my ~/.gitconfig as:

[push]
    default = current

You could also set it with:

git config --global push.default current

to set that globally.

At least, it seems to me that you're already on the develop branch and
what is happening is that you're trying to push all branches and your
master branch may be behind the one on github.

steven

On Fri, Apr 18, 2014 at 10:23 AM, joachim heintz  wrote:
> hi -
>
> i fixed a small typo in arrays.c but now i have problems to push it. my
> guess is that i committed my change internally on the master branch. is
> there any way to change it to the develop branch?
>
> my git dialog is below. thanks for any help -
>
>         joachim
>
>
> jh@lenov:~/src/csound6-git$ git branch
> * develop
>    feature/udo_type_system
>    master
>
> jh@lenov:~/src/csound6-git$ git pull
> WARNING: gnome-keyring:: couldn't connect to:
> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
> Already up-to-date.
>
> jh@lenov:~/src/csound6-git$ git log
> commit f7a665a5227e34eed13408366f9c006734039e9d
> Author: joachim heintz 
> Date:   Fri Apr 18 15:03:24 2014 +0200
>
>      fixed a typo in arrays.c (minarray1)
>
> commit 0f4cd1bf5a04f66b3945855e13a401824a09d43c
> Author: Steven Yi 
> Date:   Thu Apr 17 18:52:43 2014 -0400
>
>      added CsoundObj.js
>
> commit a6e068d1f7a6bb3c8fb5c2761d974c1e05a92bdd
> Author: Steven Yi 
> Date:   Thu Apr 17 18:46:38 2014 -0400
>
>      another fix for Emscripten
>
> commit 1571643da849e773c6bc604dd41d585980876612
> Author: Steven Yi 
> Date:   Thu Apr 17 18:31:22 2014 -0400
>
>      finished emscripten build script, added CsoundObj.c src
>
> jh@lenov:~/src/csound6-git$ git push
> WARNING: gnome-keyring:: couldn't connect to:
> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
> To https://github.com/csound/csound.git
>   ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to 'https://github.com/csound/csound.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.
>
> jh@lenov:~/src/csound6-git$ git push origin develop
> WARNING: gnome-keyring:: couldn't connect to:
> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
> Everything up-to-date
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/NeoTech
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

To add a bit, the new git default is push.default = simple (like
current but with some additional checks).

You commit should have gone through. *If* what you did in the master
branch can be dropped, then do:

git checkout master
git reset --hard origin/master



On Fri, Apr 18, 2014 at 11:34 AM, Steven Yi  wrote:
> Hi Joachim,
>
> My guess is your push default is set to something other than just the
> current branch. Check this with:
>
> git config -l
>
> I have:
>
> push.default=current
>
> here.  I have that set in my ~/.gitconfig as:
>
> [push]
>     default = current
>
> You could also set it with:
>
> git config --global push.default current
>
> to set that globally.
>
> At least, it seems to me that you're already on the develop branch and
> what is happening is that you're trying to push all branches and your
> master branch may be behind the one on github.
>
> steven
>
> On Fri, Apr 18, 2014 at 10:23 AM, joachim heintz  wrote:
>> hi -
>>
>> i fixed a small typo in arrays.c but now i have problems to push it. my
>> guess is that i committed my change internally on the master branch. is
>> there any way to change it to the develop branch?
>>
>> my git dialog is below. thanks for any help -
>>
>>         joachim
>>
>>
>> jh@lenov:~/src/csound6-git$ git branch
>> * develop
>>    feature/udo_type_system
>>    master
>>
>> jh@lenov:~/src/csound6-git$ git pull
>> WARNING: gnome-keyring:: couldn't connect to:
>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>> Already up-to-date.
>>
>> jh@lenov:~/src/csound6-git$ git log
>> commit f7a665a5227e34eed13408366f9c006734039e9d
>> Author: joachim heintz 
>> Date:   Fri Apr 18 15:03:24 2014 +0200
>>
>>      fixed a typo in arrays.c (minarray1)
>>
>> commit 0f4cd1bf5a04f66b3945855e13a401824a09d43c
>> Author: Steven Yi 
>> Date:   Thu Apr 17 18:52:43 2014 -0400
>>
>>      added CsoundObj.js
>>
>> commit a6e068d1f7a6bb3c8fb5c2761d974c1e05a92bdd
>> Author: Steven Yi 
>> Date:   Thu Apr 17 18:46:38 2014 -0400
>>
>>      another fix for Emscripten
>>
>> commit 1571643da849e773c6bc604dd41d585980876612
>> Author: Steven Yi 
>> Date:   Thu Apr 17 18:31:22 2014 -0400
>>
>>      finished emscripten build script, added CsoundObj.c src
>>
>> jh@lenov:~/src/csound6-git$ git push
>> WARNING: gnome-keyring:: couldn't connect to:
>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>> To https://github.com/csound/csound.git
>>   ! [rejected]        master -> master (non-fast-forward)
>> error: failed to push some refs to 'https://github.com/csound/csound.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.
>>
>> jh@lenov:~/src/csound6-git$ git push origin develop
>> WARNING: gnome-keyring:: couldn't connect to:
>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>> Everything up-to-date
>>
>> ------------------------------------------------------------------------------
>> Learn Graph Databases - Download FREE O'Reilly Book
>> "Graph Databases" is the definitive new guide to graph databases and their
>> applications. Written by three acclaimed leaders in the field,
>> this first edition is now available. Download your free book today!
>> http://p.sf.net/sfu/NeoTech
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/NeoTech
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

thanks to you both. i could forward my master branch, and i think the 
commit is now there (in develop). i have set the push option as steven 
suggested.

	joachim


Am 18.04.2014 16:47, schrieb Felipe Sateler:
> To add a bit, the new git default is push.default = simple (like
> current but with some additional checks).
>
> You commit should have gone through. *If* what you did in the master
> branch can be dropped, then do:
>
> git checkout master
> git reset --hard origin/master
>
>
>
> On Fri, Apr 18, 2014 at 11:34 AM, Steven Yi  wrote:
>> Hi Joachim,
>>
>> My guess is your push default is set to something other than just the
>> current branch. Check this with:
>>
>> git config -l
>>
>> I have:
>>
>> push.default=current
>>
>> here.  I have that set in my ~/.gitconfig as:
>>
>> [push]
>>      default = current
>>
>> You could also set it with:
>>
>> git config --global push.default current
>>
>> to set that globally.
>>
>> At least, it seems to me that you're already on the develop branch and
>> what is happening is that you're trying to push all branches and your
>> master branch may be behind the one on github.
>>
>> steven
>>
>> On Fri, Apr 18, 2014 at 10:23 AM, joachim heintz  wrote:
>>> hi -
>>>
>>> i fixed a small typo in arrays.c but now i have problems to push it. my
>>> guess is that i committed my change internally on the master branch. is
>>> there any way to change it to the develop branch?
>>>
>>> my git dialog is below. thanks for any help -
>>>
>>>          joachim
>>>
>>>
>>> jh@lenov:~/src/csound6-git$ git branch
>>> * develop
>>>     feature/udo_type_system
>>>     master
>>>
>>> jh@lenov:~/src/csound6-git$ git pull
>>> WARNING: gnome-keyring:: couldn't connect to:
>>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>>> Already up-to-date.
>>>
>>> jh@lenov:~/src/csound6-git$ git log
>>> commit f7a665a5227e34eed13408366f9c006734039e9d
>>> Author: joachim heintz 
>>> Date:   Fri Apr 18 15:03:24 2014 +0200
>>>
>>>       fixed a typo in arrays.c (minarray1)
>>>
>>> commit 0f4cd1bf5a04f66b3945855e13a401824a09d43c
>>> Author: Steven Yi 
>>> Date:   Thu Apr 17 18:52:43 2014 -0400
>>>
>>>       added CsoundObj.js
>>>
>>> commit a6e068d1f7a6bb3c8fb5c2761d974c1e05a92bdd
>>> Author: Steven Yi 
>>> Date:   Thu Apr 17 18:46:38 2014 -0400
>>>
>>>       another fix for Emscripten
>>>
>>> commit 1571643da849e773c6bc604dd41d585980876612
>>> Author: Steven Yi 
>>> Date:   Thu Apr 17 18:31:22 2014 -0400
>>>
>>>       finished emscripten build script, added CsoundObj.c src
>>>
>>> jh@lenov:~/src/csound6-git$ git push
>>> WARNING: gnome-keyring:: couldn't connect to:
>>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>>> To https://github.com/csound/csound.git
>>>    ! [rejected]        master -> master (non-fast-forward)
>>> error: failed to push some refs to 'https://github.com/csound/csound.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.
>>>
>>> jh@lenov:~/src/csound6-git$ git push origin develop
>>> WARNING: gnome-keyring:: couldn't connect to:
>>> /tmp/keyring-kNZEH5/pkcs11: No such file or directory
>>> Everything up-to-date
>>>
>>> ------------------------------------------------------------------------------
>>> Learn Graph Databases - Download FREE O'Reilly Book
>>> "Graph Databases" is the definitive new guide to graph databases and their
>>> applications. Written by three acclaimed leaders in the field,
>>> this first edition is now available. Download your free book today!
>>> http://p.sf.net/sfu/NeoTech
>>> _______________________________________________
>>> Csound-devel mailing list
>>> Csound-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>> ------------------------------------------------------------------------------
>> Learn Graph Databases - Download FREE O'Reilly Book
>> "Graph Databases" is the definitive new guide to graph databases and their
>> applications. Written by three acclaimed leaders in the field,
>> this first edition is now available. Download your free book today!
>> http://p.sf.net/sfu/NeoTech
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
>
>

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net