cvs update — auto^manual merge

http://durak.org/cvswebsites/howto-cvs/node28.html — detailed eg of auto-merge with “cvs update”

http://durak.org/cvswebsites/howto-cvs/node29.html — auto-merge failed.

Advertisements
Posted in cvs

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s