Re:Ask HN: Which tool(s) do you use to install/upgrade your ...
by petercooper on Thursday June 04, 2009 @12:26PM
(#641700)
[ Parent
| on HN ]
Re:Ask HN: Which tool(s) do you use to install/upgrade your ...
by jrockway on Thursday June 04, 2009 @12:31PM
(#641710)
I tend to "git pull --rebase", so that local config changes "stay on top" and don't become a merge commit.
In general, I recommend against "git pull" unless you are intentionally trying to merge something. (Fast-forwards are a special case of merging.)
Re:Ask HN: Which tool(s) do you use to install/upgrade your ...
by petercooper on Tuesday June 09, 2009 @01:10PM
(#649414)
Good point, although I maintain different environment configurations separate from the code base (or .gitignore anything that doesn't fall into that).