{"thread":{"id":"7047","subject":"Many different remote branch sources","startedAt":"2007-03-02T10:53:51Z","lastAt":"2007-03-02T22:18:36Z","messageCount":3,"participants":["Alex Riesen","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"36067","messageId":"81b0412b0703020253i3e1478a9pf505c0d95442536c@mail.gmail.com","threadId":"7047","inReplyTo":null,"subject":"Many different remote branch sources","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-03-02T10:53:51Z","receivedAt":"2007-03-02T10:53:51Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"The following does not seem to work:\n\n  [remote \"dev1\"]\n    url = ...\n    fetch = ...\n  [remote \"dev2\"]\n    url = ...\n    fetch = ...\n\n  [branch \"integration\"]\n    remote = dev1\n    merge = refs/heads/topic1\n\n  [branch \"integration\"]\n    remote = dev2\n    merge = refs/heads/topic2\n\nHow can I specify that a branch has more then one\nremote branch it can be merged with?\n"},{"id":"36100","messageId":"Pine.LNX.4.63.0703021645200.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"7047","inReplyTo":"81b0412b0703020253i3e1478a9pf505c0d95442536c@mail.gmail.com","subject":"Re: Many different remote branch sources","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-03-02T15:47:39Z","receivedAt":"2007-03-02T15:47:39Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 2 Mar 2007, Alex Riesen wrote:\n\n> The following does not seem to work:\n> \n>  [remote \"dev1\"]\n>    url = ...\n>    fetch = ...\n>  [remote \"dev2\"]\n>    url = ...\n>    fetch = ...\n> \n>  [branch \"integration\"]\n>    remote = dev1\n>    merge = refs/heads/topic1\n> \n>  [branch \"integration\"]\n>    remote = dev2\n>    merge = refs/heads/topic2\n> \n> How can I specify that a branch has more then one\n> remote branch it can be merged with?\n\nThe branch.<branchname> information is purely for determining what you \nwant to do when saying \"git pull\" (without other arguments).\n\nIn your case, I'd strongly advise against using this construct, since you \ndon't want to merge with dev1 and dev2 _at the same time_.\n\nRather, add a \"fetch = refs/heads/topic1\" at the _top_ of the remotes.dev1 \nsection, and say \"git pull dev1\" when you want to pull from dev1.\n\nCiao,\nDscho\n"},{"id":"36133","messageId":"81b0412b0703021418y6ff084d1r9eaf72aeac4eb51@mail.gmail.com","threadId":"7047","inReplyTo":"Pine.LNX.4.63.0703021645200.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: Many different remote branch sources","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-03-02T22:18:36Z","receivedAt":"2007-03-02T22:18:36Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 3/2/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> Rather, add a \"fetch = refs/heads/topic1\" at the _top_ of the remotes.dev1\n> section, and say \"git pull dev1\" when you want to pull from dev1.\n\nThis is exactly what I wanted. I just somehow believed that\ngit pull uses only references configured in branch sections,\nnever the references in \"remote\" sections. Am a bit confused.\n"}]}