| Eclipse doesn't display cvs conflict? [message #106426] |
Fri, 30 September 2005 15:47  |
Eclipse User |
|
|
|
Originally posted by: hendrik_maryns.despammed.com
Hi group,
Do I see right that Eclipse doesn't display a different icon for files
that contain conflicts? In TortoiseCVS they get a red label, it would
be nice if there were a similar icon in Eclipse too, so as to easily see
where attention is needed.
Anybody a suggestion, or is this a bug?
TIA, H.
--
Hendrik Maryns
==================
www.lieverleven.be
http://aouw.org
|
|
|
|
|
| Re: Eclipse doesn't display cvs conflict? [message #106921 is a reply to message #106845] |
Mon, 03 October 2005 12:52  |
| Eclipse User |
|
|
|
In resolving the conflicts that show up: Sometimes in resolving the conflicts I want to take what the other person did,
and I figured out how to copy that over, but sometimes I want to keep my work so I don't bring their work over. When I
run an actual update I get conflicts in my files but there isn't a flag on the files (That I can decider) to know which
files actually ended up with conflicts.
(We also work with *sigh* Dreamweaver templates so many conflicts are resolved when we do template updates. So it's
sometimes hard to see which files *actually have conflicts so I miss some of them.)
So maybe the question is, what do I do when I've taken the information I want from them, but don't want to take the
rest? What tools do I have available to me in that case. I've been unable to figure this out. (It took an accidental
hover to find the little arrow to copy code over so I got that far.)
Thanks
Joelle
Eric Rizzo wrote:
> Clayton Neff wrote:
>
>> Hendrik -
>>
>>> Do I see right that Eclipse doesn't display a different icon for
>>> files that contain conflicts? In TortoiseCVS they get a red label,
>>> it would be nice if there were a similar icon in Eclipse too, so as
>>> to easily see where attention is needed.
>>> Anybody a suggestion, or is this a bug?
>>
>>
>>
>> The Synch view shows the files that have conflicts. In fact, you can
>> filter it to show ONLY the conflicts. And showing conflicts is a
>> pretty transient thing. After all, right after you synch up someone
>> else may check something in that causes a conflict.
>
>
> Right-click your project (or any file or directory in it) and choose
> Team > Synchronize with repository. Also, read the Help topics related
> to CVS Synchronization.
>
> HTH,
> Eric
|
|
|
| Re: Eclipse doesn't display cvs conflict? [message #106941 is a reply to message #106921] |
Mon, 03 October 2005 13:37 |
| Eclipse User |
|
|
|
Originally posted by: cneff.at.crosslogic.dot.com
Joelle -
> So maybe the question is, what do I do when I've taken the information I
> want from them, but don't want to take the rest? What tools do I have
> available to me in that case. I've been unable to figure this out. (It
> took an accidental hover to find the little arrow to copy code over so I
> got that far.)
Once you have fixed the conflicting file to your satisfaction (by
bringing in the other code, keeping yours, or some combination of the
two), you can mark the file as merged. When you do that (with a
right-click on the file in the tree view of the sync screen) your file
no longer shows as having a conflict (since you told it you have
resolved them). You can then check in your change(s) with a commit,
just as if there hadn't ever been a conflict.
If you are looking for some historical view of conflicts (what files
were in conflict BEFORE you resolved them), I don't know of one.
-- Clayton --
|
|
|
Powered by
FUDForum. Page generated in 0.07775 seconds
Home