Finding the file in conflict

[kaptan]

Flare complaints about a file in conflict but does not show which.
How can I find it?
Thanks in advance..

[emsachs]

You need to install an external tool for your source control package. For example, for SVN a lot of people use Tortoise, although I just use the command line and that works for me. All dedicated source control packages have a command/feature that lets you check the status of your local copy against the server and flag conflicts.

[kaptan]

I am already using Git via bitbucket.org.

I have decided to use good ol'manual method:

1. Checkout another copy and
2. Compare the files with Total Commander & WinMerge.

Thank you anyway!