[kwlug-disc] Advanced(?) Git usage question

Jonathan Poole jpoole at digitaljedi.ca
Tue Apr 15 20:26:55 EDT 2014


Yes, we had a fellow that was 42 days behind on his branch, spent a few weeks rebasing, and then ultimately just merging and dealing with the mess.  Rebase is your friend.

On Apr 15, 2014, at 8:09 PM, Chris Frey <cdfrey at foursquare.net> wrote:

> On Tue, Apr 15, 2014 at 07:43:13PM -0400, Jonathan Poole wrote:
>> I’ve adopted the git-flow branching model at home, and work.
>> With little hesitations now, we are growing to love it.  Merging and
>> rebasing is fairly straightforward, but I don’t know what kind of code
>> your writing that would not inherit the model successfully.
> 
> I assume you're referring to this:
> 
> 	http://nvie.com/posts/a-successful-git-branching-model/
> 
> I mostly do use that flow, but in my experience, the number of merge
> commits (as opposed to fast-forwards) are pretty low, since I highly
> favour rebasing before ultimately merging with master, wherever possible.
> It keeps history simple, and keeps my development in sync with the
> lastest good code.
> 
> - Chris
> 
> 
> 
> _______________________________________________
> kwlug-disc mailing list
> kwlug-disc at kwlug.org
> http://kwlug.org/mailman/listinfo/kwlug-disc_kwlug.org





More information about the kwlug-disc mailing list