See incoming Version conflicts (svn)?

In Eclipse you can preview incoming changes with handy conflict detection prior to actually initiating an update. Is this available in IntelliJ IDEA? Thanks all!

8 comments
Comment actions Permalink

changes window (alt +9), than select "incoming" tab
cheers,
/m

0
Comment actions Permalink

Yes, but where can I see what's conflicting with local changes in the incoming tab?

0
Comment actions Permalink

Same question here... would be nice to see that, for example in the "local" tab, marking locally modified files that have a newer version on the repository. It is visible if you open such a file (a yellow banner at the top of the file, noting that the file is outdated; using v11), but for a long list of files that is cumbersome.

0
Comment actions Permalink

Have you found the anwer to see the incoming version conflicts ? if yes ,can you share it?

0
Comment actions Permalink

Hello,
Yes, you can see changed on server files highlited. For this you should go to settings=>version control=>background check checkbox "check every" under "changed on server" conflicts and set time period.
After this in local changes you can see "changed on server" red text near conflict files

0
Comment actions Permalink

Thanks for your reply.
But i have another question,About the "Changed on server" option,the doc explain as below:

help_doc.jpg


My question is : Does the idea check all checked out files or only the changed  files in the "change list"(means locally changed). if is "Check all",it is better to provide an option to only check the files in the "change list" or provide a away to check (ie a menu) So before check in the code ,i will manually check it ...

0
Comment actions Permalink

Lance,
Idea checks only locally changed files.

0
Comment actions Permalink

Got it, Thanks for your reply.

0

Please sign in to leave a comment.