View Single Post
Old 14 March 2014, 22:02   #61
kaffer
Registered User
 
Join Date: May 2011
Location: Cambridge
Posts: 337
Quote:
Originally Posted by FrodeSolheim View Post
I'll be happy to merge in a sequence of commits as long as the end result (I mean the state of the head commit) is good. No reason to lose history unless you want to / have a good reason to coalesce commits If you start experimenting with unrelated features, it's best if you keep the scp work in a separate branch so I can pull from that.
This is a good idea, I have put the SCP-related changes in branch scp. I will keep master branch tracking yours, and rebase the scp branch on top of that when I pull from you.
kaffer is offline  
AdSense AdSense  
 
Page generated in 0.04834 seconds with 9 queries