On Wed, Nov 9, 2011 at 8:46 PM, Adam Williamson <awill...@redhat.com> wrote:
> I'm currently going through and bumping several packages whose Rawhide
> builds have got behind their F16 builds.
>
> I've come across several packages where git merge hit 'conflicts' for no
> readily apparently reason in this case.

http://nathaniel.themccallums.org/2010/10/18/using-git-fast-forward-merging-to-keep-branches-in-sync/
-- 
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel

Reply via email to