{"thread":{"id":"1613","subject":"Re: Pushing back to shared repo with a different named branch","startedAt":"2005-08-22T01:59:10Z","lastAt":"2005-08-22T03:01:25Z","messageCount":2,"participants":["Martin Langhoff"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7630","messageId":"46a038f9050821185965869612@mail.gmail.com","threadId":"1613","inReplyTo":null,"subject":"Pushing back to shared repo with a different named branch","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-22T01:59:10Z","receivedAt":"2005-08-22T01:59:10Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Following earlier discussions, I've setup a team repo where all\nheads/branches are. We have many interrelated branches so it makes\nsense to keep it all together. to work, we do single-branch checkouts\nusing ssh like:\n\ncg-clone locke.catalyst.net.nz:/var/git/moodle.git#mdl-osc-ceed moodle-osc-ceed\n\nnow, after a few commits, I'm ready to push back onto the branch.\ncg-push won't let me, and I kind of expected that. It says:\n\n$ cg-push origin \ncg-push: pushing to a different head not supported yet\n\nBut git isn't playing ball either. What is the right incantation to\ntell it to push origin to where it came from.\n\n$ cat .git/branches/origin \nlocke.catalyst.net.nz:/var/git/moodle.git#mdl-osc-ceed\n\ngit-push-script origin\nerror: remote ref 'refs/heads/master' is not a strict subset of local\nref 'refs/heads/master'.\nerror: remote ref 'refs/heads/origin' is not a strict subset of local\nref 'refs/heads/origin'.\n\nI am not using the 'remotes' setup, because I want to avoid too much\nsetup of each repo/working copy. Is there a simple way of doing this?\n\ncheers,\n\n\nmartin\n"},{"id":"7629","messageId":"46a038f90508212001330b5d3e@mail.gmail.com","threadId":"1613","inReplyTo":"46a038f9050821185965869612@mail.gmail.com","subject":"Re: Pushing back to shared repo with a different named branch","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-22T03:01:25Z","receivedAt":"2005-08-22T03:01:25Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Resolved checking last week's thread of cogito push to branches:\n\ngit-push-script   ssh://locke.catalyst.net.nz/var/git/project.git\nmaster:branchname\n\ncheers,\n\n\nmartin\n"}]}