Re: Merging to and from non-current branches.

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

 



>>>>> "mgreg" == lists@mgreg com <lists@xxxxxxxxx> writes:

mgreg> As I said, I understand what is being said, but in IMHO it would seem
mgreg> that a merge of that nature would be immediately desirable.  Think of
mgreg> it more as a local "push".  I'm never a fan of "because it hasn't be
mgreg> done means it shouldn't be".  I realize that's not exactly what you're
mgreg> saying though.  Anyway, I absolutely appreciate the post, and may very
mgreg> well post the script.

In other words, you'd be happy with it if it was just a fast-forward only?

Because the moment you might have conflicts, that *has* to be the workdir
so you can resolve those conflicts.  Dunno why this is so hard to grok.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@xxxxxxxxxxxxxx> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]