Flutterby™! : Perforce

Next unread comment / Catchup all unread comments User Account Info | Logout | XML/Pilot/etc versions | Long version (with comments) | Weblog archives | Site Map | | Browse Topics

Perforce

2002-03-14 18:36:57+00 by Dan Lyke 1 comments

Reason Perforce scares me #4165:

machine$ p4 resolve
/long/path/to/filename.c - merging //repository/to/filename.c
Diff chunks: 0 yours + 134 theirs + 0 both + 7 conflicting
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) [e]:

[ related topics: Dan's Life Software Engineering ]

comments in ascending chronological order (reverse):

#Comment made: 2002-03-15 13:26:04+00 by: meuon

Dan Lyke: Circa 1994

"It's not what a program does, it's what a program does when it doesn't."

Dan Lyke: Circa 2002

Sounds like it still applies, don't you like cryptic messages?