greptilian logo

IRC log for #sourcefu, 2013-03-07

http://sourcefu.com

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

All times shown according to UTC.

Time S Nick Message
02:39 westmaas_ joined #sourcefu
02:40 westmaas joined #sourcefu
15:08 * pdurbin improves his redmine script: https://github.com/pdurbin/scripts/blob/master/redmine
19:17 * pdurbin cries for help with `git rebase`: http://colabti.org/irclogger/irclogger_log/git?date=2013-03-07#l3061
19:52 larsks pdurbin: What's your question about git rebase?
19:52 * larsks is too lazy to go reading irc logs...
19:52 pdurbin heh
19:52 pdurbin so there's a pretty picture at http://nvie.com/posts/a-successful-git-branching-model/ we're trying to follow
19:53 pdurbin you kind need to have read that first before i can explain...
19:53 larsks I am familiar with it.
19:53 pdurbin ah. cool
19:54 pdurbin so here's our develop/integration branch: https://github.com/iqss/dvn/tree/develop
19:54 pdurbin i branched from develop to make this feature branch: https://github.com/iqss/dvn/tree/2656-lucene
19:55 pdurbin and i want to have myself and another guy both make commits to the feature branch and push to github (push to the feature branch)
19:55 larsks Okay...
19:56 pdurbin and i *thought* i should be rebasing along the way... keeping the feature branch up to date with develop... kind like the thinkup model at http://www.thinkupapp.com/docs/contribute/developers/devfromsource.html (thought the branches have different names)
19:56 pdurbin but after chatting in #git i think i shouldn't do any rebasing...
19:56 pdurbin because when i do i have to do `git push --force1
19:56 pdurbin whoops
19:56 pdurbin git push --force
19:57 pdurbin which becomes a problem when the other guy tries to pull
19:57 larsks Yeah, because rebase generates a new set of commits.  It's a good idea (possibly) with your *local* branch (it's a good way to incorporate changes from develop into your feature branch), but you don't typically want to rebase after having pushed your branch out.
19:58 larsks ...so if you're working on the same feature branch as someone else, rebase is probably never a good idea.
20:27 pdurbin this is my second feature branch i've been rebasing on top of develop. in both cases i've need to --force a git push after a while... for the first feature branch i simply wanted to back up my work somewhere so i figured i'd push the branch back to origin. with this second feature branch i'm more keen to push so the other guy and i can collaborate on it
20:32 pdurbin larsks: "hmm. that larsks guy is smart ;)" -- http://colabti.org/irclogger/irclogger_log/git?date=2013-03-07#l3302
21:12 pdurbin http://purebreeze.com/2010/08/how-do-you-avoid-git-merge-commits/ boils down to git commit; git fetch; git rebase origin/master; git push ... which is pretty much what I do to avoid merge commits

| Channels | #sourcefu index | Today | | Search | Google Search | Plain-Text | plain, newest first | summary

http://sourcefu.com