[TYPO3-mvc] FYI: GitHelper

Franz Koch typo3.RemoveForMessage at elements-net.de
Mon Jan 31 14:15:51 CET 2011


Hey Bastian,

> I've created a little tool, that should make it a bit easier to clone
> TYPO3 extensions, packages, application & distributions:
> http://www.wwwision.de/githelper/
>
> This is just a little experiment I did - mainly to brush ub my ExtJS
> skills a little. I think a collection of TYPO3 specific Git FAQs,
> tutorials and such helper tools in addition to the current documentation
> would be good to support the Git newbies..

thanks for your helper and for pointing to the wiki pages. After reading 
those and having configured everything I've got a short question about 
how one should work with his local repo, having in mind that each local 
commit (even in a branch) would also become a changeset in the upstream 
codebase as stated here [1]. What is the most practicable workflow to 
get "clean" commits when working on multiple tasks/patches at once?

Example:
As you might know I'm currently working on the TCA group support and 
created a local branch for it. Of course I'd like to keep this branch 
updated - so I pull the latest changes at least once a day. As long as 
I'm working in that branch I can of course temporarily stash my changes 
and pull the updates. But as soon as I like to work on a different 
branch (i.e. to solve another issue) I first have to commit my changes 
to the branch, because otherwise they would move to the branch I'm 
switching to (this is at least what happens for me).

So according to [1], what I'm I supposed to do? Drop working in branches 
and only use multiple stashes instead (not sure if this is easily 
manageable)? Or probably better create a second clone, apply the final 
patch there and commit from this repo to gerrit? Or "simply" use rebase? 
(don't know about how to deal with rebase - haven't read the doku about 
it yet)



So what is your guys every days workflow. What turned out to be the most 
practicable and less time consuming approach for you?



[1] 
http://forge.typo3.org/projects/team-forge/wiki/Working_with_Gerrit_as_a_Developer#Pushing-to-gerrit
-- 
kind regards,
Franz Koch


More information about the TYPO3-project-typo3v4mvc mailing list