Win a copy of Pro Spring MVC with WebFlux: Web Development in Spring Framework 5 and Spring Boot 2 this week in the Spring forum!
  • Post Reply Bookmark Topic Watch Topic
  • New Topic
programming forums Java Mobile Certification Databases Caching Books Engineering Micro Controllers OS Languages Paradigms IDEs Build Tools Frameworks Application Servers Open Source This Site Careers Other Pie Elite all forums
this forum made possible by our volunteer staff, including ...
Marshals:
  • Campbell Ritchie
  • Ron McLeod
  • Paul Clapham
  • Jeanne Boyarsky
  • Liutauras Vilda
Sheriffs:
  • Rob Spoor
  • Bear Bibeault
  • Tim Cooke
Saloon Keepers:
  • Tim Moores
  • Stephan van Hulst
  • Tim Holloway
  • Carey Brown
  • Piet Souris
Bartenders:
  • Frits Walraven
  • Himai Minh

Merging code between two branches.

 
Sheriff
Posts: 9680
42
Android Google Web Toolkit Hibernate IntelliJ IDE Spring Java
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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.
sample.JPG
[Thumbnail for sample.JPG]
This is a snapshot of the merge dialog box
 
Sheriff
Posts: 6920
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
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.
 
Ankit Garg
Sheriff
Posts: 9680
42
Android Google Web Toolkit Hibernate IntelliJ IDE Spring Java
  • Mark post as helpful
  • send pies
    Number of slices to send:
    Optional 'thank-you' note:
  • Quote
  • Report post to moderator
I tried what you said and indeed this is the correct way to do it. Thanks for the help
 
She still doesn't approve of my superhero lifestyle. Or this shameless plug:
Thread Boost feature
https://coderanch.com/t/674455/Thread-Boost-feature
reply
    Bookmark Topic Watch Topic
  • New Topic