<p dir="ltr"><br>
On May 27, 2013 11:17 AM, "Sérgio Basto" <<a href="mailto:sergio@serjux.com">sergio@serjux.com</a>> wrote:<br>
><br>
> Hi,<br>
> git puts me crazy<br>
><br>
> in here :<br>
> <a href="http://pkgs.fedoraproject.org/cgit/debconf.git/">http://pkgs.fedoraproject.org/cgit/debconf.git/</a><br>
><br>
> I have master now correct and want F19 be the same (git merge master)<br>
> but do a commit just in F19, seems that never will be the same .<br>
><br>
> I try<br>
> fedpkg switch-branch f19<br>
> git rebase master<br>
><br>
> merges conflict ???<br>
> I just want F19 be a copy master who I can do that ?<br>
><br>
> Thanks,<br>
> --<br>
> Sérgio M. B.<br>
><br>
> --<br>
I've been using <br>
"git checkout $targetbranch; git checkout $sourcebranch -- relative/path/to/file" <br>
to pull $file from $sourcebranch to $targetbranch. Globbing with * works, too. I have no idea if this is the best approach, but it works for my purposes. </p>
<p dir="ltr">--Pete </p>