Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

file contains conflict

Questions
Tags
Users
Badges
Hung Lam
JAZZ DEVELOPER (291●19●15) Jul 21 '08, 10:25 a.m.
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.

0 votes

2 answers
4,527 views
0 votes

2 answers

Permanent link
Daniel Triphaus
(16●1●1) 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 votes

Permanent link
Hung Lam
JAZZ DEVELOPER (291●19●15) Jul 21 '08, 11:48 a.m.
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.

0 votes

Your answer

Register or log in 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.

Ask a question
Guidelines
FAQ
Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details

Question asked: Jul 21 '08, 10:25 a.m.

Question was seen: 4,527 times

Last updated: Jul 21 '08, 10:25 a.m.

Confirmation Cancel Confirm