tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Massimo Lusetti <mluse...@gmail.com>
Subject Re: svn commit: r1186711 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Date Fri, 21 Oct 2011 06:51:33 GMT
On Thu, Oct 20, 2011 at 4:48 PM, Howard Lewis Ship <hlship@gmail.com> wrote:

> I create a new local branch for work, but don't dcommit it to
> apache.org; instead I rebase it onto the trunk and then git svn
> dcommit.

This is what I've done:
git branch myBranch
git checkout myBranch
git commit -a ...
git checkout trunk
git merge myBranch
git svn rebase
git svn dcommit

So I should have used git rebase instead of merge? Does it fast
forward any commit too?

Thanks
-- 
Massimo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org


Mime
View raw message