[clug] Git help please - I might be breaking branches

[Daniel Pittman]

Daniel Pittman <daniel at rimspace.net> writes:
> Alex Satrapa <grail at goldweb.com.au> writes:
>> On 23/03/2009, at 13:49 , Daniel Pittman wrote:

[...]

>> I get stuff from Subversion to svn-trunk, then locally branch to
>> "ticket-123", work locally to resolve the ticket, then locally merge
>> back to the git branch named "svn-trunk". These are not upstream
>> changes, these are changes i end up pushing back to the upstream using
>> dcommit. Any changes that happen upstream are taken into account
>> during my subversion dance steps of fetch/rebase.
>
> Ah.  I stand corrected: you are not doing this the way that the upstream
> git-svn developer recommends, but rather with local branches.  Oh,
> well.

Ah, the irony.: I meant to say "with local branches and merges", but
omitted the second part in rewriting to try and make my intention
clearer.

Regards,
        Daniel