IntelliJ IDEA 7.0.x Helps Avoid Conflicts
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 version conflicts, and keeps a watchful eye on the changes that you and your teammates commit to the repository.
Suppose you open a file for editing and start typing, without synchronizing your local copy first. If somebody else has already modified the same file and has committed changes to the repository, IntelliJ IDEA detects the newer version in the repository and displays a banner on top of the editor, suggesting you to view the differences between your local copy and the repository version of the file and update the file before proceeding with your changes:
To make this feature work, click the button in the Repository or Incoming tabs of the Changes tool window at least once prior to editing.
Information about all the changes committed to the repository, but not yet checked out locally, is also available in the Incoming tab of the Changes tool window:
Subscribe to Blog updates
Thanks, we've got you!
Profile on the Fly With the IntelliJ Profiler
At JetBrains, we believe that profiling should be simple and accessible to all developers, regardless of their level of expertise. That’s why the IntelliJ Profiler puts ease of use and seamless integration at the forefront of its mission. In previous releases, we introduced a range of features to s…
History of Gradle Delegation Process in IntelliJ IDEA
Nowadays, a build tool is an essential part of any project, and IntelliJ IDEA integrates with the majority of them. Among the most popular build tools is Gradle. We’d like to give a brief historical overview of its integration with IntelliJ IDEA and the delegation process implemented inside the I…
How to Work With Protobuf-Maven Projects in IntelliJ IDEA
Protobuf, short for Protocol Buffers, is a language-agnostic data serialization format developed by Google. It is designed to efficiently and reliably serialize structured data to communicate between different systems and programming languages. Protobuf offers a compact binary representation of data…
Turbocharge Lombok annotations with IntelliJ IDEA
If you’re a professional Java developer, you probably use IntelliJ IDEA as your IDE and Lombok as the framework that handles the Java boilerplate. What you probably didn’t know is that not only do these 2 technologies work well on their own, but when combined, they’re even more efficient than when u…