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.
Providing some short info about a little known Cryptocurrency that has been around since late 2017.
I wanted to do a summary so that way if someone out there is looking for the same type of project that I was. They might want to take a look at this one, and see if it was right for them.
I came across Iridium while scouring the bitcointalk message boards. I was looking for a small project that wasn’t currently on an exchange and wasn’t mined to hell. I wanted to get in on a project that might be able to use my help. Most new cryptocurrency projects as soon as they post to bitcointalk.org are usually pretty polished. …
Testing out Favable’s top pick. To see if they are actually the best.
I came across these by searching for top boxer briefs. Sometimes, I like to see what over opinions are out there. I found Favable’s top picks for 2017, and these were on it. One of the things that they pointed out is that these are another pair of underwear that has elastic in the leg. Mack Weldon is another pair that uses this method, and I like it a lot. …
Here is the greatly anticipated YAPcoin.
In the YAPcoin project we believe in our hearts that cryptocurrency will change the world. However today, the cryptocurrency market is frankly a shit show. There are ICOs, and new coins everyday. Most of which have no innovative or redeeming technologies.
Boys girls, and others, this coin is another one of those coins. YAPcoin was created from the fork of the cryptonote project. So, in essence it is the exact same thing. Just rebranded with our YAPcoin label.
We just wanted to create a new coin to see what could be done. Currently we don’t have any plans to enhance the technology, or be ground breaking. Hell, we figured if DOGE can go for two years without having an update, and be worth a billion dollars. …
Amazon deals discoveries!
These are the long legged version of a pair I saw on the Amazon daily deal. David Archys are featured pretty often on amazon deals. So, I at least know from experience that being on the Amazon deal list doesn’t automatically mean that they aren’t quality. It usually just means that some store is trying to sell off excess stock.
I did have to take a bit of a chance on these. They only had two reviews at the time of me buying them. They were both five stars, but with only two reviews total. …
How does the most advertised underwear I have ever seen stack up?
These have got to be the most advertised boxer briefs I have come across. I see advertising for these on billboards, on TV, on the internet, beamed directly into my brain by lasers. I mean the advertisements are everywhere. Oddly enough, when I talk to people about reviewing underwear, these have come up a couple of times. …
Update — Even after publishing two reviews for Pair of Thieves and Jockey. The top five still stand. Pair of Thieves got into the 8th place spot due to the inconsistencies in chafe levels. If I have an option to grab any one of the others above it. I am going to, because they are all more consistent than Pair of Thieves. Life by Jockey took the 10th place spot, because having to adjust every ten minutes is a bit to much of a commitment in underwear.
These have amazing comfort that stays with them even when you walk over 17,000 steps. You can find them on amazon reasonably priced. The vendor has one of the better warranties that I have seen. For me, they have lived up to every promise that the manufacture claims. …
This explains how to post to both Medium and Steemit without screwing up your search results.
Let me just start off by saying I love both Steemit, and Medium. Each of the platforms offers something that the other doesn’t.
Oddly enough this was a pain in the butt to find. I eventually googled “Medium Import Tool,” and was able to see the answer located here:
This post has a link to the import tool. You just click the link, and copy+paste your Steemit article, and import it to medium.
If you are wondering why you would want to do this instead of just copy+paste your articles into each platform. It is because you want to have the canonical link added to your posts. The canonical link keeps google from dinging your posts in the search rankings for duplicate content. You can read more about canonical links here. …