You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ben Reser <be...@reser.org> on 2004/10/18 21:08:18 UTC
Re: svn commit: r11393 - trunk
On Thu, Oct 14, 2004 at 06:00:21AM -0500, lundblad@tigris.org wrote:
> +It is a good idea to try merging a proposed change onto the branch
> +when adding it in STATUS to ensure that it doesn't produce merge
> +conflicts.
I really think we should say it is required to try and merge the
change before it gets added to the branch.
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r11393 - trunk
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
On Mon, 18 Oct 2004, Ben Reser wrote:
> On Thu, Oct 14, 2004 at 06:00:21AM -0500, lundblad@tigris.org wrote:
> > +It is a good idea to try merging a proposed change onto the branch
> > +when adding it in STATUS to ensure that it doesn't produce merge
> > +conflicts.
>
> I really think we should say it is required to try and merge the
> change before it gets added to the branch.
>
>
+1
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r11393 - trunk
Posted by Ben Reser <be...@reser.org>.
On Mon, Oct 18, 2004 at 02:08:18PM -0700, Ben Reser wrote:
> On Thu, Oct 14, 2004 at 06:00:21AM -0500, lundblad@tigris.org wrote:
> > +It is a good idea to try merging a proposed change onto the branch
> > +when adding it in STATUS to ensure that it doesn't produce merge
> > +conflicts.
>
> I really think we should say it is required to try and merge the
> change before it gets added to the branch.
I said branch, I meant added to STATUS. I think everyone knew what I
meant but I thought I would clarify.
--
Ben Reser <be...@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org