On Tue, Dec 14, 2010 at 4:20 PM, john skaller <skal...@users.sourceforge.net> wrote: > > Looks pretty nice to me. Yeah, merging is a bit scary. > > My main concern is that this kind of model is for teams of developers, > where some time is required to manage the work flow. But we don't > have any teams, we barely have 1.414 developers. So what happens > if a new developer comes along? Now they have to install git-flow > AS WELL as git (better make git-flow a submodule of felix :)
git flow is just a convenience wrapper around other git commands. For instance, "git flow feature start foo" is just: git checkout -b features/foo and "git flow feature stop foo" is: git checkout develop git merge --no-ff features/foo git branch -d features/foo > and learn even more things to contribute: getting rid of interscript > was supposed to make it easier. Not necessarily. First off, It's pretty simple for someone to mail us a patch and for us to apply it without needing to understand our repository workflow. Second, github also has nice support for handling pull requests: http://help.github.com/pull-requests/ Third, it's pretty easy to change the default branch to develop, so anyone new would just submit patches just as they would now. Only you and I would care about the branch management. I could give you some more hands on experience with that too next time you're on gmail if you want. > I already have enough trouble doing really simple things, like replacing > a broken file (no, git fetch file does not work): Do you mean "git checkout file"? If not, that's the command you want :) If so, then something strange happened. Can you send me the output? > I had to completely blow away > everything yesterday just to make this happen. I have enough trouble keeping > track of what's happening in the compiler and libraries without having to > think > about multiple repositories and branches. > > for example, if I make a branch for some "feature" I'm playing with and I also > need to fix some bugs, now I don't even know if the feature is backed up > on github. Here's a quick example of how I work with branches. I'll ignore the whole git-flow for now. I'll start off with a clean checkout. % git branch * master I want to pull judy out into a submodule, and so I'll start some work: % git log remotes/origin/master..HEAD commit 50d0a79102f2e95b63d0ff515226709d0fefbf6f Author: Erick Tryzelaar <eri...@felix-lang.org> Date: Tue Dec 14 18:20:24 2010 -0800 another change commit 8325c825d716a0a07dce06f6b462caa3592ab195 Author: Erick Tryzelaar <eri...@felix-lang.org> Date: Tue Dec 14 18:19:19 2010 -0800 test change I haven't finished yet, but there's some build system bug that I need to fix. I have some uncommitted files, so I'll just through those into a temporary commit: % git commit -m "work in progress, don't push" -a [master 7e819c9] work in progress, don't push 1 files changed, 0 insertions(+), 2 deletions(-) Then I'll create a branch, and reset my master branch back to the origin: % git branch extract-judy % git reset --hard remotes/origin/master ... do some work % git push origin master Now, back to the branch. I'll switch to the branch and clear out the temporary commit: % git checkout extract-judy % git reset --soft HEAD^ "--soft" in this case changes what commit the branch "extract-judy" is pointing at, but it doesn't modify the files. The end result is that I now have the files modified and uncommitted, just where I was before. Oh, and about things backed up onto github. github doesn't get any changes until you do a "git push". Until you do that all your changes are saved in your local git repository. We could set you up another remote repository if you want to save in-progress changes though, and just leave github.com/erickt/felix as the official repository. ------------------------------------------------------------------------------ Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d _______________________________________________ Felix-language mailing list Felix-language@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/felix-language
