This post originated from an RSS feed registered with Java Buzz
by s m.
Original Post: Subversion. Easy merge for feature branches
Feed Title: IntelliJ IDEA Blog
Feed URL: http://blogs.jetbrains.com/idea/feed/
Feed Description: News, tips&tricks, how-to's and other issues related to IntelliJ IDEA
Feature branches have simple life cycle, they usually consume trunk changes and are merged back into trunk after the work is completed.
In IntelliJ IDEA 9.0.3 EAP, take all trunk changes into feature branch and reintegrate back into trunk using new “Merge from…” action:
You can merge all changes in one shot or select a subset of [...]
Previous Topic
