NetBeans Forums

 FAQFAQ   SearchSearch   MemberlistMemberlist   RegisterRegister   ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 
  

Rebase vs Merge on netbeans

 
Post new topic   Reply to topic    NetBeans Forums -> Java EE Users
View previous topic :: View next topic  
Author Message
onlinedev



Joined: 26 Nov 2016
Posts: 9

PostPosted: Sat Nov 26, 2016 4:19 pm    Post subject: Rebase vs Merge on netbeans Reply with quote

Hello everyone,
Can anyone please describe when do I need to use rebase and when merge on netbeans?
I'm having a hard time finding info on this topic.

Thank you for your time!
Back to top
Simon, Charles
Posted via mailing list.





PostPosted: Mon Nov 28, 2016 7:16 pm    Post subject: Rebase vs Merge on netbeans Reply with quote

I assume you are using a GIT repository. If so, then look at the GIT docs for merge and rebase. There is a very good explanation there.

-----Original Message-----
From: onlinedev [mailto:address-removed]
Sent: Saturday, November 26, 2016 11:19 AM
To: address-removed
Subject: [nbj2ee] Rebase vs Merge on netbeans

Hello everyone,
Can anyone please describe when do I need to use rebase and when merge on netbeans?
I'm having a hard time finding info on this topic.

Thank you for your time!
Back to top
onlinedev



Joined: 26 Nov 2016
Posts: 9

PostPosted: Mon Nov 28, 2016 11:07 pm    Post subject: Reply with quote

Sorry, I forgot to mention that I'm using Github repository.
Back to top
priya465



Joined: 17 Aug 2017
Posts: 29

PostPosted: Tue Sep 12, 2017 6:47 am    Post subject: Reply with quote

Merging is nice because it’s a non-destructive operation. The existing branches are not changed in any way. This avoids all of the potential pitfalls of rebasing .
As an alternative to merging, you can rebase the feature branch onto master branch using the following commands:

git checkout feature
git rebase master

This moves the entire feature branch to begin on the tip of the master branch, effectively incorporating all of the new commits in master. [/url]
Back to top
Display posts from previous:   
Post new topic   Reply to topic    NetBeans Forums -> Java EE Users All times are GMT
Page 1 of 1

 
Jump to:  
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You can download files in this forum


Powered by phpBB
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2012, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo