It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Follow this question
Question details

×42,787

question asked: Jul 21 '08, 10:25 a.m.
question was seen: 4,100 times
last updated: Jul 21 '08, 10:25 a.m.

Related questions

FAQ - How this Forum works

file contains conflict

0
Hung Lam (291●19●15) | asked Jul 21 '08, 10:25 a.m.
JAZZ DEVELOPER
Hello,
When I select to apply a patch (Team > Apply Patch...), I see this
message (File contains conflict) and when I try to merge into workspace,
I always get errors. Do you know why I am getting this "File contains
conflict" message?
Thanks.

2 answers

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Daniel Triphaus (16●1●1) | answered Jul 21 '08, 11:14 a.m.
You get this message if someone altered the file you also altered and these two changes are in conflict with each other. maybe viewing both files in change explorer may help.
0
permanent link
Hung Lam (291●19●15) | answered Jul 21 '08, 11:48 a.m.
JAZZ DEVELOPER
Thank you.
I think you are right. I came across this in Eclipse InfoCenter:
"This resource should contain the same file revisions as the line-up on
which the patch was generated.."

dtriphaus wrote:
You get this message if someone altered the file you also altered and
these two changes are in conflict with each other. maybe viewing both
files in change explorer may help.

Your answer

Register or to post your answer.


Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.