This post originated from an RSS feed registered with Java Buzz
by Dave Booth.
Original Post: IntelliJ IDEA 7.0.x Helps Avoid Conflicts
Feed Title: IntelliJ IDEA Blog
Feed URL: http://blogs.jetbrains.com/idea/feed/
Feed Description: All the most recent updates, views, and information on IntelliJ IDEA... straight from the source.
In a team environment, it’s rather easy to run into a conflict of versions, when you are working on the same piece of source code. Now IntelliJ IDEA 7.0.x helps you avoid conflicts in your code, and smartly keeps an eye on the changes that you and your team-mates commit to the repository.
Suppose you [...]