On May 27, 2013 11:17 AM, "Sérgio Basto" <ser...@serjux.com> wrote: > > Hi, > git puts me crazy > > in here : > http://pkgs.fedoraproject.org/cgit/debconf.git/ > > I have master now correct and want F19 be the same (git merge master) > but do a commit just in F19, seems that never will be the same . > > I try > fedpkg switch-branch f19 > git rebase master > > merges conflict ??? > I just want F19 be a copy master who I can do that ? > > Thanks, > -- > Sérgio M. B. > > -- I've been using "git checkout $targetbranch; git checkout $sourcebranch -- relative/path/to/file" 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.
--Pete
-- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel