There are instances while working with a shared repo that your Pull Request will hit a conflict with the master repo and that will prevent your PR from being merged.
The easiest way to resolve this is going to be via your terminal.
Step 1 – Ensure you are working with the master repo (the repo you are trying to push your PR too)
The key is to make sure the origin of your repo is pointing to the right repository. By default, your local repo will probably have it’s origin set to your specific branch. Deconflicting in this instance is not possible.
I was recently working with a new Windows app we built at CleanBrowsing and our users were getting hit with security warnings post-installation. This warning was generated because the app was not signed.
Ok, let’s get things signed.
To sign I would need a code-sign certificate. I went through the process of getting an Extended Validation (EV) certificate from GlobalSign.
Site Note: The process was not too bad, you sign some forms, take some pictures and you’re done. You do need a Windows machine when download the certificate, be prepared for that.
This biggest annoyance is that you need Internet Explorer to download the certificate and install it on your token. I had to download IE 11 to get this done. Yes, I tried with MS Edge, and other modern browsers but nothing worked.
Couple of Prerequisites to be aware of:
SafeNet (You will get your token from this organization)
/a = automatically set the name according to what was on the certificate, if you want to set it differently I believe you use /n “subject name”
/tr = This sets the timestamp, and the “r” option references a RFC3161 compliant trusted time stamp. Each CA will have a timestamp you can use. For example Globalsign uses: http://rfc3161timestamp.globalsign.com while DigiCert uses: http://timestamp.digicert.com
(note: the irony of those not using HTTPS is not lost on me)
/td = This sets the timestamp algorithm to use, the recommended configuration is SHA256 so just use that and save yourself the headache. Every provider will do this a bit differently. For GlobalSign, it only works if you use /advanced in the slug the way I have it: http://rfc3161timestamp.globalsign.com/advanced with the /td SHA256
” “ = Lastly, make sure you put the path to the executable you are trying to sign, include the double quotes.
When you hit enter, it will ask you for the token password ( I hope you haven’t forgotten it):
When it’s done, you’ll get this output in your command prompt:
Done Adding Additional Store Successfully signed: C:\Users\[User name]\path\to\file.exe
If you do, be mindful that some apps might not load. For me, it was the Google Authenticator app. This was especially concerning because I use it for Two Factor Authentication (2FA) on a lot of systems.
The solution is simple, and all credit goes to Nick Lowe for sharing it:
It’s extremely straight forward. Once you offload it, you’ll see it immediately asks you to reinstall it. So don’t get too panicked.
One thing to be mindful of is iDevice Storage is generic and accounts for iPhone and iPAD. For me, on an iPhone it reads iPhone Storage:
What’s really nifty about this is it offloads the app without losing the data. Being this is my 2FA app, it’s critical I don’t lose it.
Installing, this may take a few minutes… WslRegisterDistribution failed with error: 0x80370102 Error: 0x80370102 The virtual machine could not be started because a required feature is not installed.
This was extremely frustrating for a couple of reasons:
1 – Powershell was showing that Virtualization was enabled
2 – I could not find my virtualization option in Bios the way it was being recommend
Verify Virtualization Option In Your BIOS
In the end, I looked up my specific BIOS on Google and queried what they called Virtualization. It turns out, that for my specific motherboard (ASUS X570-PLUS) their virtualization option in the BIOS is called SVM Mode.
Enabling SVM Mode in the BIOS did the trick for me and I was able to proceed with my installation of Linux.
This post assumes you have successfully installed PHP-FPM and have confirmed it is running on the server, and
# systemctl status php7.2-fpm.service
● php7.2-fpm.service - The PHP 7.2 FastCGI Process Manager
Loaded: loaded (/lib/systemd/system/php7.2-fpm.service; enabled; vendor preset: enabled)
Active: active (running) since Thu 2020-08-13 03:40:43 UTC; 14min ago
Configured on the site:
But still getting this:
The good news is you are actually pretty close, and it’s actually something you missed in your site config file.
Go back and verify the port you’re listening on (e.g., vim /etc/php/7.2/fpm/pool.d/[pool name].conf). For instance, in my case it was: