[an error occurred while processing this directive] [an error occurred while processing this directive][an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] (none) [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive][an error occurred while processing this directive] [an error occurred while processing this directive][an error occurred while processing this directive] [an error occurred while processing this directive][an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive] (none) [an error occurred while processing this directive] [an error occurred while processing this directive] [an error occurred while processing this directive][an error occurred while processing this directive]
 
[an error occurred while processing this directive] [an error occurred while processing this directive]
Skåne Sjælland Linux User Group - http://www.sslug.dk Home   Subscribe   Mail Archive   Forum   Calendar   Search
MhonArc Date: [Date Prev] [Date Index] [Date Next]   Thread: [Date Prev] [Thread Index] [Date Next]   MhonArc
 

CVS og overlappende rettelser (Was: billederne er gledet ud i forsker)



Janus Sandsgaard skrev:
> Jacob Sparre Andersen <sslug@sslug> writes:

> Tak. Jeg var i gange med andre rettelser samtidig, og får
> (derfor?) nu følgende fejlmeddelels når jeg forsøger at
> comitte:
>
>         sslug@sslug forsker]$ cvs commit manuskript.sgml
>         cvs commit: Up-to-date check failed for `manuskript.sgml'
>         cvs [commit aborted]: correct above errors first!
>
> Hvad skal jeg gøre for at lægge mine rettelser ind
> samtidig med at jeg får den ajourførte opgave fra Jacob
> med i min egen pubic_html?

Hvis du kører `cvs update` skulle den gerne flette mine
rettelser sammen med dine (men tag en sikkerhedskopi af dine
rettelser først, hvis du ikke stoler på CVS endnu).  Hvis
der er nogle overlap bliver de vist markeret med "<<<<<" i
filerne.

Jacob
-- 
"Sleep is just a cheap substitute for coffee"


 
Home   Subscribe   Mail Archive   Index   Calendar   Search

 
 
Questions about the web-pages to <www_admin>. Last modified 2005-08-10, 18:52 CEST [an error occurred while processing this directive]
This page is maintained by [an error occurred while processing this directive]MHonArc [an error occurred while processing this directive] # [an error occurred while processing this directive] *