aspose file tools*
The moose likes IDEs, Version Control and other tools and the fly likes Merging code between two branches. Big Moose Saloon
  Search | Java FAQ | Recent Topics | Flagged Topics | Hot Topics | Zero Replies
Register / Login


Win a copy of Java 8 in Action this week in the Java 8 forum!
JavaRanch » Java Forums » Engineering » IDEs, Version Control and other tools
Bookmark "Merging code between two branches." Watch "Merging code between two branches." New topic
Author

Merging code between two branches.

Ankit Garg
Sheriff

Joined: Aug 03, 2008
Posts: 9280
    
  17

Hi! I am working on a project where I and another person are working on the same code but different branch. Both of us are making updations to the code. Now to merge our code, I use the "Merge Changes from Branch" command with my branch as the working branch, and the other branch as the other branch. Now I just want to confirm that is this the correct way to do this. Actually we are both new to this project and it is a very big project. So I am not sure if this is working or not. So I just want to confirm this. I am using Netbens 6.



[Thumbnail for sample.JPG]



SCJP 6 | SCWCD 5 | Javaranch SCJP FAQ | SCWCD Links
Frank Carver
Sheriff

Joined: Jan 07, 1999
Posts: 6920
It certainly looks like the right sort of thing.

HOWEVER, if you are not sure about anything, even just one parameter, then I suggest that you don't experiment with your "very big project". Create a new, much smaller, one with a few files and try it out. Check some stuff in and out, practice merging and so on. Only when you are completely confident that you know what you are doing should you risk screwing up a major project repository.


Read about me at frankcarver.me ~ Raspberry Alpha Omega ~ Frank's Punchbarrel Blog
Ankit Garg
Sheriff

Joined: Aug 03, 2008
Posts: 9280
    
  17

I tried what you said and indeed this is the correct way to do it. Thanks for the help
 
It is sorta covered in the JavaRanch Style Guide.
 
subject: Merging code between two branches.
 
Similar Threads
Multibranch development with SVN
One-To-Many bidirectional
Refactoring Mercilessly in separate branches
Version/release maintainance
Managing changes in SVN/Subclipse