The last few weeks have presented a series of extremely trying RL (real-life) challenges to deal with outside of my coding life. There were a few rounds of very upsetting news, on a personal level. I had to make a move on short notice, to a remote area where (believe it or not) internet and cell reception are hard to come by. It took a week and a half to get internet, due to various hold-ups… and since I had no cell reception either, it was very hard to get much done as there was no easy way to look up syntax or examples when I got stuck. Other obligations are suddenly making increased demands on my time and energy, while a number of things have simultaneously gone awry which have been or will be very time-consuming to sort out. Staying focused through the trials and upsets has taken a monumental effort at times.
In short, it’s been pretty horrendous.
I’m a determined soul, though, when I have a goal in mind, so I refuse to quit. It’s just going to take some serious tenacity (and sleep deprivation) to see things through. I love what I’m doing, I’m enthusiastic about this project, and I want this experience, so I’m going to give it all I’ve got.
An in-depth understanding of Git has been slow in coming, I’m afraid. I used Subversion, once upon a time in a class far far away, so the concepts of branching and checking out code and merging aren’t new. Much of the time, technology just kind of innately makes sense to me, and new concepts fall into place with relative ease (considering the complexity of the topic at hand, anyway). I’ve found it inexplicably difficult, however, to wrap my head around Git. I know what I want to do in a given situation, but figuring out how to make Git actually do it has taken an inordinately long time. Recently, some relatively minor fixes were made, but stored on a different repository, and I couldn’t figure out how to pull the changes to my local machine. I ultimately ended up waiting until the changes were merged into the origin. By then, unfortunately, I was half-configured for the other repository… so it took time and some fancy dancing to get everything back to normal. Ick. Well, mistakes lead to more learning, even if the resulting predicaments can be frustrating at times. This evening’s learning, however out of place it may be in the middle of this post, was how to pull the latest changes from the remote of a branch you’ve been working on. I want to post it here, now, because I may not remember to do it later:
git fetch upstream yourworkingbranch