Re: Why does git merge have so much trouble with Fedora package branches?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11/10/2011 10:15 AM, Jesse Keating wrote:
> On Nov 10, 2011, at 1:52 AM, Fabian Deutsch wrote:
>> 
>> Someone might correct me, but rebasing introduces problems for 
>> co-maintainers, if upstream (maintainer) decides to rebase some
>> branch.
>> 
>> See http://man.he.net/man1/git-rebase
> 
> Our repo setup does not allow non-fastforward changes, so there is no
> way to have a rebase action create problems for other maintainers.

I suppose you mean no "git push -f", but do you also prevent deleting
branches?  Otherwise you can manually force by deleting and pushing
anew.  Of course, if you're doing that, you'd be better be very aware
that you're playing with fire...

-- 
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]
  Powered by Linux