conflicts vs potential conflicts
I'm trying to understand the difference between
"conflicts" and "potential conflicts." In
https://jazz.net/learn/LearnItem.jsp?href=content/docs/source-control/conflicts/index.html,
it says "Conflicts occur when you accept changes into a
repository workspace. Whereas potential conflicts are a
function of the current flow target and are not
persisted, conflicts are a property of the repository
workspace and live with it until they are resolved."
I'm a little confused by this... I understand that if I
have a potential conflict between an outgoing change
set and one of my flow targets, I can remove that flow
target and the potential conflict will disappear. But
if an incoming change set conflicts with something in
my workspace, can't I just do the same thing (change my
flow target so that the incoming change set goes away)?
How is the conflict persisted?
"conflicts" and "potential conflicts." In
https://jazz.net/learn/LearnItem.jsp?href=content/docs/source-control/conflicts/index.html,
it says "Conflicts occur when you accept changes into a
repository workspace. Whereas potential conflicts are a
function of the current flow target and are not
persisted, conflicts are a property of the repository
workspace and live with it until they are resolved."
I'm a little confused by this... I understand that if I
have a potential conflict between an outgoing change
set and one of my flow targets, I can remove that flow
target and the potential conflict will disappear. But
if an incoming change set conflicts with something in
my workspace, can't I just do the same thing (change my
flow target so that the incoming change set goes away)?
How is the conflict persisted?
One answer
On Tue, 05 Feb 2008 11:58:01 -0500, Richard O. Curtis wrote:
Potential conflicts can be both due to incoming or outgoing changesets.
In your example you are right, both of those situations are potential
conflicts.
Real conflicts occur if you were to accept the incoming changes, thus
turning the potential conflicts into real conflicts in your workspace.
- Dmitry
I'm a little confused by this... I understand that if I have a potential
conflict between an outgoing change set and one of my flow targets, I
can remove that flow target and the potential conflict will disappear.
But if an incoming change set conflicts with something in my workspace,
can't I just do the same thing (change my flow target so that the
incoming change set goes away)? How is the conflict persisted?
Potential conflicts can be both due to incoming or outgoing changesets.
In your example you are right, both of those situations are potential
conflicts.
Real conflicts occur if you were to accept the incoming changes, thus
turning the potential conflicts into real conflicts in your workspace.
- Dmitry