Wiki Forum Sign up! Explore Home

Not signed in (Sign In)

LiveSearch

Welcome, Guest

Want to take part in these discussions? Sign in if you have an account, or apply for one below

Vanilla 1.1.2 is a product of Lussumo. More Information: Documentation, Community Support.

General: need to merge my changes on master branch..

Bottom of Page

1 to 22 of 22

  1.  
    • CommentAuthorattiq
    • CommentTimeMay 20th 2009
     permalink
    Hello team,
    I am from Rich applications consulting Pakistan.I have done some changes in Clocking IT .Now we want to merge our changes into master branch.Please let me know how can i do that.or whats the process for doing merging??if any body else responsible for merging code from different branches ???

    thanks Attiq
    • CommentAuthorari
    • CommentTimeMay 20th 2009
     permalink
    You are best off making a fork of the project on github and applying your changes there:

    http://github.com/ari/clockingit/tree/master

    Please ensure your commit messages are extremely clear about the purpose of each change, and that you have unit tests in place where possible. Then let me know by sending a pull request.
    • CommentAuthorattiq
    • CommentTimeMay 21st 2009
     permalink
    ari ! i am trying to clone from github ,but i am getting this error..

    github.com[0: 65.74.177.129]: errno=Invalid argument
    fatal: unable to connect a socket (Invalid argument)

    any idea??
    • CommentAuthorari
    • CommentTimeMay 22nd 2009
     permalink
    That's a networking or firewall error I'm guessing. The github support might be more help.

    Ari
    • CommentAuthorattiq
    • CommentTimeMay 27th 2009
     permalink
    ari ,i have checked my firewall and other settings,i am able to clone code for other projects from git hub.but could not able to clone code for clocking IT yet.Please help me out,i need to push my changes on the master branch immediate.
    • CommentAuthorari
    • CommentTimeMay 27th 2009
     permalink
    Your best bet is to contact support at github. I have no control over their servers or setup and am not in the best position to help. What command are you using to clone?

    Ari Maniatis
    • CommentAuthorattiq
    • CommentTimeMay 27th 2009
     permalink
    I am using " git clone git://github.com/ari/clockingit.git" from git bash.but its not working for me...
    • CommentAuthorari
    • CommentTimeMay 27th 2009
     permalink
    Looks right to me. But if you want to fork, you'd normally create an account on github, fork the repository and then use the secure form of checkout (with ssh keys) to create a read/write fork.
    • CommentAuthorattiq
    • CommentTimeMay 27th 2009
     permalink
    Thanks Ari,now i am able to clone the code from github.I have commited my changes,please do integrate them.
    • CommentAuthorattiq
    • CommentTimeMay 27th 2009
     permalink
    i have commietd my changes ,but when i try to "push" it display error

    Looking up github.com ... done.
    Connecting to github.com (port 9418) ... 65.74.177.129 done.
    fatal: protocol error: expected sha/ref, got '
    *********'

    You can't push to git://github.com/user/repo.git
    Use git@github.com:user/repo.git

    if just "commit" is enough to upload changes on master
    • CommentAuthoradmin
    • CommentTimeMay 27th 2009
     permalink
    You need to create an ssh key, attach that to your github account, and make sure the url part of the correct remote in .git/config looks something like this:

    [remote "origin"]
    url = git@github.com:<YourUserName>/clockingit.git
    fetch = +refs/heads/*:refs/remotes/origin/*
    [branch "master"]
    remote = origin
    merge = refs/heads/master


    -- Erlend
    • CommentAuthorari
    • CommentTimeMay 28th 2009
     permalink
    The help documentation is very good:


    http://github.com/guides/home
    • CommentAuthorattiq
    • CommentTimeJun 1st 2009
     permalink
    i have created the ssh keys,but still i am getting the same error

    Looking up github.com ... done.
    Connecting to github.com (port 9418) ... 65.74.177.129 done.
    fatal: protocol error: expected sha/ref, got '
    *********'

    You can't push to git://github.com/user/repo.git
    Use git@github.com:user/repo.git

    *********'


    whats wrong now??
    • CommentAuthorari
    • CommentTimeJun 1st 2009
     permalink
    What did the github support people say? I still think you are confusing us with them...
    • CommentAuthorattiq
    • CommentTimeJun 2nd 2009
     permalink
    ari,i have created my ssh key according to he step by step process given on the link http://github.com/guides/providing-your-ssh-key#msysGit

    "Leave the files where they are. Running ssh-keygen sets up the keys for both Git Bash and Git GUI that all come part of msysGit."

    it shows that ssh is already set up.but how can i configur my ssh key with the server..??

    Can you please give me a favor ??? If i give you the code(my changes),can you push it to the master???
    • CommentAuthorari
    • CommentTimeJun 2nd 2009
     permalink
    1. Create a support request here http://support.github.com/

    Those people will be able to much more easily give you the support you need to fix this problem. When you get the message "You can't push to git://github.com/user/repo.git" what username are you using there? Which user are you in the fork tree?


    2. You can email a patch to the dev mailing list as per the instructions here: http://wiki.clockingit.com/dev:index

    But this isn't a great long term approach if you have several patches.
    • CommentAuthorattiq
    • CommentTimeJun 4th 2009
     permalink
    Ok Thanks Ari
    • CommentAuthorattiq
    • CommentTimeJun 4th 2009 edited
     permalink
    ari,i got the issue,

    i think you need to add my ssh key on git hub

    you need to give me the access/write on git..for that you need to add my ssh key for clockingIT on git hub..
    • CommentAuthorari
    • CommentTimeJun 5th 2009
     permalink
    No, you need to create your own fork of the project on github under your own account and then you can add your own key.

    Ari
    • CommentAuthorattiq
    • CommentTimeJun 16th 2009
     permalink
    Ari,i have created my own fork on

    http://github.com/ari/clockingit/tree/master

    as

    http://github.com/attiq/clockingit/tree/master

    i have pushed my changes on git.

    i have created patches for each my commit.
    now i am trying to email my patches by reading

    http://wiki.clockingit.com/dev:index

    but i am getting reply from the dev@clockingit.com

    You are not allowed to post to this mailing list, and your message has
    been automatically rejected. If you think that your messages are
    being rejected in error, contact the mailing list owner at
    dev-owner@clockingit.com.

    any idea ,whats the issue is????
    • CommentAuthorari
    • CommentTimeJun 17th 2009
     permalink
    I have made a few comments against your patches on github. If you wish to discuss them further, please use the dev mailing list.

    Ari
    • CommentAuthoradmin
    • CommentTimeJun 17th 2009
     permalink
    I tried replying to your question about not being able to post to the mainlinglist, and that error means you're not subscribed to the list and can't post. If I allow posting without subscription we'd end up with nothing but spam there.

    -- Erlend

1 to 22 of 22

  1.