On Sat, Dec 15, 2012 at 01:55:07PM -0600, Bruno Wolff III wrote: > On Sat, Dec 15, 2012 at 18:26:23 +0000, > "Richard W.M. Jones" <rjones@xxxxxxxxxx> wrote: > > > >I find it easy enough to primarily work in master, and do: > > > > cd ../f18 > > git pull ../master > > > >to pull the changes into f18 (I'm using 'fedpkg clone -B'). > > How is that different than "git merge master"? I usually do a merge > and then remove entries from the changelog that don't apply and do > another commit. I use git checkout to switch between branches. AFAIK it's exactly the same, but I like using the separate branch directories :-) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/ -- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel
