Re: [cdt-dev] Reminder to use 'rebase' instead of 'merge'

["Schaefer, Doug" <Doug.Schaefer@xxxxxxxxxxxxx>]

I usually notice immediately after I do it J. It’s not really that big a deal, but it does make the history view, which I find invaluable when working with git, easier to grok.

 

:D

 

From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf Of Marc Khouzam
Sent: Thursday, September 01, 2011 9:11 AM
To: 'CDT General developers list.'
Subject: [cdt-dev] Reminder to use 'rebase' instead of 'merge'

 

Hi,

 

I've seen a couple of merges on the main CDT repo recently, looking at the Git history.

This is just a reminder that when you want to merge your branch into master or cdt_8_0, etc,

it is cleaner to use 'rebase'.  Your change will still appear on the main branch, but the

history will be linear instead of split.  So, set your current branch to e.g., master,

the right-click on your sub-branch and select 'rebase'.

 

Thanks

 

Marc

 

P.S. You'll notice I made the same mistake in the past :-)