Re:What’s Wrong with Git? A Conceptual Design Analysis
by Skinney on Monday December 30, 2013 @07:09AM
(#6984244)
> There are some things I still don't get about git. And I still find myself with some weird commits that look like I'm committing what other people just committed (because my tree was behind theirs/HEAD, and I had commits that happened and then I had to pull in order to push...I still don't know how to avoid that, other than always pulling immediately before doing any commits and then pushing immediately after committing, which feels clunky).
Git pull --rebase?
Re:What’s Wrong with Git? A Conceptual Design Analysis
by smharris65 on Monday December 30, 2013 @09:38AM
(#6984747)
When you commit other developers work you are merging in the wrong "direction".Please read:
http://tech.novapost.fr/merging-the-right-way-en.html
There are some things I still don't get about git. And I still find myself with some weird commits that look like I'm committing what other people just committed (because my tree was behind theirs/HEAD, and I had commits that happened and then I had to pull in order to push...I still don't know how to avoid that, other than always pulling immediately before doing any commits and then pushing immediately after committing, which feels clunky).
I tinkered with some other distributed revision control systems before it was apparent git would win the majority of the mindshare (and actually before git even existed). Someone I worked on the Squid project with also happened to be an arch and then bzr developer (and I think now works at Canonical on DVCS), so I spent quite a bit of time using those. I also found them kinda confusing. But, not so much that I couldn't get work done.