Re: branch proposal

[Ben Pfaff]

John Darrington <address@hidden> writes:

> I'm still comming to terms with git, but SCM tools I've worked with in
> the past normally make it possible to have a branch which
> *automatically* inherits changes which are commited to its parent (ie
> the thing it branches from).  Isn't this possible with git?

No, it is not possible.

I don't understand how it could work with any SCM.  Isn't there
always the possibility for merge conflicts that have to be
resolved by hand?

Which SCM tools make this possible, and under what name?
-- 
"Long noun chains don't automatically imply security."
--Bruce Schneier