| Date Of Receipt: 12-MAY-1993 08:40:49.26
From: WASTED::zap "Carolyn Hurley"
To: [email protected]
CC: wasted::zap, wasted::odehelp
Subj: Re: hand merge or script.
Paula,
I believe your 11 cent bet is correct, Kim could confirm, ODE V2.0 does
use the revision history in the file as one of the ways to determine merges.
To override a merge conflict during the bsubmit, when prompted use the
"rco" option. "rco" will take your copy (branch) of the file and
override the merge. We don't generally recommend using this option
since users could get sloppy and loose important changes that have
occurred to the file. So use extreme caution!
Both bsubmit and bmerge man pages describe the rco option.
/Carolyn
=======================
Return-Path: [email protected]
Received: by wasted.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91);
id AA21156; Tue, 11 May 1993 20:25:42 -0400
Received: by abyss.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91);
id AA03040; Tue, 11 May 1993 20:25:06 -0400
Message-Id: <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: hand merge or script.
Date: Tue, 11 May 93 20:25:05 -0400
From: [email protected]
X-Mts: smtp
Hi,
Did the rules for deciding if a merge is required
when submitting change with ODE V2.0? I bet 11 cents,
that ode is using rev history as one of the factors for
deciding a merge is required on a submit instead of
using the level the check-out was done at. Is this true?
If this is a true is there a don't help me switch for
bsubmit, which basically says ignore the merge...
thanks
Paula
|