Error ! [rejected] master -> master (non-fast-forward) on Heroku/Git 

$ git push origin master
# To https://github.com/user/repo.git
#  ! [rejected]        master -> master (non-fast-forward)
# error: failed to push some refs to 'https://github.com/user/repo.git'
# To prevent you from losing history, non-fast-forward updates were rejected
# Merge the remote changes (e.g. 'git pull') before pushing again.  See the
# 'Note about fast-forwards' section of 'git push --help' for details.
This error can be a bit overwhelming at first, do not fear. 
Simply put, git push -f https//github.com/user/repo.git to force the upload.

Comments

Post a Comment

Popular posts from this blog

I hate the PDF format

Image
The other day I was trying to get a graphical novel from the web but the only format that I found was PDF. In some manner, I was sure it was all that I needed but the PDF format was messing with the images on my Kindle Paper White.  The solution: Extract the images. The problem: PDF. The PDF format its crap, because of everyone it's trying to get a piece of the action behind it. So every extractor, converter or creator costs money or its freemium(for paying later) or its a scam. I searched for an open-source way of a deal with it and I came across this tool. It was fantastic! Pkpdfconverter lets you export text images tex + images in an elegant and simple way the interface look kind of old but it deserves being checked out. Here is the link to the project in Sourceforge: https://sourceforge.net/projects/pkpdfconverter/
Read more

Free DNS setup for a domain showing a Blogger web page

Image
I was very busy with some configuration for a friend's blog on Blogger. She was paying a fee for the DNS redirect from her national DNS service to blogger, and I help her to stop paying for that. I'll write the steps to reproduce the free DNS setup via CloudFlare, that by the way its an excellent way to manage the DNS for free. Step 1 In the first place, you need to add the domain to Cloudflare after creating an account in  Cloudflare . After that, we must provide the DNS of Cloudflare to our national domains service, usually, they are: fred.ns.cloudflare.com pola.ns.cloudflare.com Step 2 The next step it's to locate the "configuration area" in Blogspot > Settings > Basic > Publishing >  Blog Address > "+ Set up a third-party URL for your blog - Point your own registered URL to your blog." Step 3 In there is an input box for setting your domain URL including the subdomain www o blog or whatever... after you put it,
Read more

The Video converter I needed

Image
Handbrake it's an open-source video transcoder and a lifesaver!  For people that don't have a lot of time for transcoding or don't know a lot about video. I was trying to get working an OGM file on my TV and the format was not recognized by it. It even wasn't visible by Plex that is a great server-client app for organizing video. So I decided to convert those stupid files.  The solution... Handbrake it was like magic!  It let me: Choose the format to convert the files Select various types of files Remove annoying audio tracks on the file Add some subtitles  Force subtitles that were necessary for the video. So I give you the link for this miraculous and simple app that lets you work on all your videos at once. https://handbrake.fr/rotation.php?file=HandBrake-1.3.1-x86_ 64-Win_GUI.exe The web site for this guy is  https://handbrake.fr/  go check it out.
Read more