On Thu, Jan 6, 2011 at 1:30 PM, Mike Frysinger <[email protected]> wrote:
> On Thu, Jan 6, 2011 at 2:35 PM, Garrett Cooper wrote:
>> A really bad merge (I posted a reply to it a while ago in the archives).
>
> is there a way for us to manage the git hooks ? we could have them
> reject trivial merge commits (ones that should be fast forwards), and
> commits with merge cruft in it ...
This was nastier. A lot of the problems I caused was ignorance and
human error based -- in particular I thought that git reset --hard
would actually reset merges (but it didn't!) and I didn't bother to
fake the push before I did it and the rest is history. So I don't know
if adding hooks would fix that, but I think that the tool should reset
merges if I do reset --hard.
I need to note some of the fun points I've had with git so far
because there are a handful of items with the tool that have really
made my life painful in the past couple of weeks that should be fixed.
Thanks,
-Garrett
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
