I created an interesting problem for myself last night while working on some code for personal use. I’ll state upfront that the code is not public so I didn’t have to worry about screwing things up for other people. Just myself, though the goal was not to. Following is a description of the circumstances and how I used git to rectify the situation.
Tag: git
Categories
Bare git
It’s been awhile since I’d learned anything interesting regarding git. Frankly, my needs are modest and I’ve been making due with my current work flow. My only real problem was every now and again, I’d run into trouble with merges.
Turns out, there was a perfectly reasonable explanation.
I didn’t know what the hell I was doing.
Categories
Starting to ‘git’ it
The hardest part for me, so far, about using git is to actually use it. I mean, I’m checking out branches, making changes and the like. But mentally I’m still in the mode of organizing file versions in my head and then futzing with command line stuff (mv, `cp and the like), as opposed to using git to help me do that.
More recently I had a couple minor git revelations that indicate I’m starting to grok this whole VCS thing a little more.