IntelliJ IDEA
IntelliJ IDEA – the Leading IDE for Professional Development in Java and Kotlin
                    				Features
	                    
                    
                        	
                        
                    
                                                                
                                                                                                                                
                                
                                                                            
                                
                                
                                                                            
                                                                    
                            
                                                            
                
                
                Subversion. Easy merge for feature branches
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 them. Changelist with merged changes is created and offered for commit.

