Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cdt-dev] Reminder to use 'rebase' instead of 'merge'



   Several of these were me. I did them with Pawel and then afterwards we realized my policies were

   not correct. I have fixed this, but I have no doubts I will make other rookie mistakes.


    Thanks for the GIT patience.




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'




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'.






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



Back to the top