I wrote this in a page, because I have to keep searching for it.
If you made changes in a different branch, and that got pushed to master, but you need to get them back into your current working branch.
The way I usually do it.
If on Github it is normally.
git rebase origin/master
The only downside to my way is that you have to check in your current branch changes before rebasing.
The way that most people want to do it.
git checkout master
git checkout dev
git merge master
Originally published at https://shantysite.com.
My brief foray into the world of short legged boxer briefs.
The packaging was super deceptive. Based on the picture above you can see that on the package the legs looked longer than they really ended up being. I expected a little shorter legs. What I did not expect is to open up the package and find a pair of damn briefs!
I was beyond pissed! They didn’t even look remotely close to what they were in the picture. Short leg my ass! This is a no leg boxer brief. Which is in fact a damn brief. I really shouldn’t review these things, because I gave up on briefs, but screw it. …