Mailing List Archive


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

Re: [tlug] search for encrypted information exchange



Stephen J. Turnbull wrote:
> Curt Sampson writes:
>  > Stephen J. Turnbull wrote:
>  > 
>  > > In fact, git might be preferable to Subversion on the grounds that if
>  > > there *is* a conflict, git guarantees that you have literal copies of
>  > > all the files involved in the conflict.  (Maybe Subversion does too...
>  > 
>  > Yes, it does.
>
> AFAICS from your reply to Edward, it seems likely that you can
> generate them by reverting patches,

But where do you get the version number for the version you were
originally based off.  If there is a conflict there will be a file
prefixed with its version number but if no conflict occurs occurs?

Edward


Home | Main Index | Thread Index

Home Page Mailing List Linux and Japan TLUG Members Links