Jason Howmans nosajio

## merge-conflict-rebase.md

      
              1 file
            
          
              1 fork
            
          
              4 comments
            
          
              11 stars
            
          
                scottyhq
                / merge-conflict-rebase.md
            
            
              Created
              August 10, 2020 18:25
            
              
                GitHub PR Merge Conflict Resolution with Rebase
              
          
    How to rebase a pull request to fix merge conflicts

It's quite common to open up a pull request on GitHub and be confronted with the message This branch has conflicts that must be resolved. This situation arises when you create a feature branch on an older commit from the master branch. Maybe you forgot to run git pull master before git checkout -b geocoding_vignette or maybe a collaborator changed some of the same files on GitHub while you've been working on new things. There are many ways to fix this. One is using the Web Editor build into GitHub and fixing conflicts by hand. This works great if there are not too many conflicts.
Another technique is to rebase your pull request onto the master branch (Move your additional commits on top of the most recent master commit). This is conceptually clean, but sometimes confusing in practice to do cleanly. This example walks through the process where you want to do a rebase, and resolve conflicts by overwriting whatever is on the master branch with change

  
## Cargo.toml
[package]
name = "yourpackage"
version = "0.1.0"
authors = ["John Doe"]
edition = "2018"

[[bin]]
name = "example"
path = "stream-a-file-using-rust-hyper.rs"

## init.vim
" Specify a directory for plugins
call plug#begin('~/.vim/plugged')

Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'scrooloose/nerdtree'
"Plug 'tsony-tsonev/nerdtree-git-plugin'
Plug 'Xuyuanp/nerdtree-git-plugin'
Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
Plug 'ryanoasis/vim-devicons'
Plug 'airblade/vim-gitgutter'

## index.js
const MainProcessNotification = require("electron").Notification;
const isRenderer = process && process.type === "renderer";
const isSupported = () => isRenderer ? "Notification" in window : MainProcessNotification.isSupported();
const renderNotify = (title, body) => {
    const notification = new Notification(title, {
        body: body
    });
    return notification
};
try {

## How we use cloudfront and next.js.md

      
              1 file
            
          
              41 forks
            
          
              27 comments
            
          
              226 stars
            
          
                rbalicki2
                / How we use cloudfront and next.js.md
            
            
              Created
              April 21, 2018 20:35
            
          
    How we incorporate next and cloudfront (2018-04-21)


Feel free to contact me at robert.balicki@gmail.com or tweet at me @statisticsftw

This is a rough outline of how we utilize next.js and S3/Cloudfront. Hope it helps!
It assumes some knowledge of AWS.
Goals


## S3-Static-Sites.md

      
              1 file
            
          
              99 forks
            
          
              58 comments
            
          
              533 stars
            
          
                bradwestfall
                / S3-Static-Sites.md
            
            
              Last active
              April 10, 2024 16:40
            
              
                Use S3 and CloudFront to host Static Single Page Apps (SPAs) with HTTPs and www-redirects. Also covers deployments.
              
          
    S3 Static Sites

⚠ This post is fairly old. I don't keep it up to date. Be sure to see comments where some people have posted updates
What this will cover

Host a static website at S3
Redirect www.website.com to website.com
Website can be an SPA (requiring all requests to return index.html)
Free AWS SSL certs
Deployment with CDN invalidation


## Readme.MD

      
              1 file
            
          
              0 forks
            
          
              2 comments
            
          
              9 stars
            
          
                cyan198
                / Readme.MD
            
            
              Last active
              November 3, 2022 12:14
            
              
                Setup WiFi with snap on Ubuntu Core
              
          
    Connect to WiFi on Ubuntu Core using Snap

It was done on the following environment:

Raspberry Pi 3 Model B
OS: Ubuntu Core
Pi is connected to internet via Ethernet

Here are the overview of the steps:

  
## mozoptimize
#!/bin/bash
# Compresses all .jpg/.jpeg and saves them to opt/
# works with spaces in filenames
# make sure you adjust the path to mozjpeg bin
# uses the mozilla mozjpeg encoder from https://github.com/mozilla/mozjpeg
# based on https://gist.github.com/sauramirez/e0ef5059ab637ed3e2cea090b504f385
# Che4ter - 2017

#Change to mozjpeg path
MOZJPEG='/opt/mozjpeg/bin/'

## command.sh
find `pwd` -type d -maxdepth 3 -name 'node_modules' | xargs -n 1 tmutil addexclusion

## DrawSineWave.html
<!DOCTYPE html>
<html>

<head>
    <title>Sine Wave</title>
    <script type="text/javascript">
        function showAxes(ctx,axes) {
            var width = ctx.canvas.width;
            var height = ctx.canvas.height;
            var xMin = 0;
	[package]
	name = "yourpackage"
	version = "0.1.0"
	authors = ["John Doe"]
	edition = "2018"

	[[bin]]
	name = "example"
	path = "stream-a-file-using-rust-hyper.rs"
	" Specify a directory for plugins
	call plug#begin('~/.vim/plugged')

	Plug 'neoclide/coc.nvim', {'branch': 'release'}
	Plug 'scrooloose/nerdtree'
	"Plug 'tsony-tsonev/nerdtree-git-plugin'
	Plug 'Xuyuanp/nerdtree-git-plugin'
	Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
	Plug 'ryanoasis/vim-devicons'
	Plug 'airblade/vim-gitgutter'
	const MainProcessNotification = require("electron").Notification;
	const isRenderer = process && process.type === "renderer";
	const isSupported = () => isRenderer ? "Notification" in window : MainProcessNotification.isSupported();
	const renderNotify = (title, body) => {
	const notification = new Notification(title, {
	body: body
	});
	return notification
	};
	try {
	#!/bin/bash
	# Compresses all .jpg/.jpeg and saves them to opt/
	# works with spaces in filenames
	# make sure you adjust the path to mozjpeg bin
	# uses the mozilla mozjpeg encoder from https://github.com/mozilla/mozjpeg
	# based on https://gist.github.com/sauramirez/e0ef5059ab637ed3e2cea090b504f385
	# Che4ter - 2017

	#Change to mozjpeg path
	MOZJPEG='/opt/mozjpeg/bin/'
	<!DOCTYPE html>
	<html>

	<head>
	<title>Sine Wave</title>
	<script type="text/javascript">
	function showAxes(ctx,axes) {
	var width = ctx.canvas.width;
	var height = ctx.canvas.height;
	var xMin = 0;