Thread (9 messages) flat view 9 messages, 7 authors, 2016-06-15

Re: With feature branches, what is ever committed directly to master

From: Steven E. Harris <hidden>
Date: 2016-06-15 22:49:19

Jon Seymour [off-list ref] writes:
Otherwise, I keep them clean and merge them into the base of my
working branch (as described into an earlier note).  By always merging
into the base of my working branch (and never the tip) I can keep my
working tree stable and my patches clean.
Can you clarify what you mean by "merging into the base" and "never the
tip"? Perhaps a pointer to the earlier note you mentioned would suffice.

-- 
Steven E. Harris
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help