Skip to content

Instantly share code, notes, and snippets.

View lennykioko's full-sized avatar
😄
Happy

lenny lennykioko

😄
Happy
View GitHub Profile

// improve performance of repo git maintenance start

// list all aliases git config --get-regexp --global alias

git config --global alias.st status git config --global alias.ft fetch git config --global alias.cm commit

npx create-next-app -e with-tailwindcss

Merge conflicts

Happens when working on a team project when two/more developers have edited the same file.
Therefore, face the conflict courageously.

Assumption: current_branch(local branch) conflicts with a base branch called base-branch

Solving a merge conflict by rebasing

  1. git pull origin --rebase develop. If merge conflicts persist:
  2. Fix merge conflicts by accepting either current changes, incoming changes or Accept both changes
@lennykioko
lennykioko / Dockerfile
Created February 26, 2019 08:23 — forked from ju2wheels/Dockerfile
Docker Dockerfile reference template
# Last updated: 08/24/2916
#
# Total instructions available: 18
#
# https://docs.docker.com/engine/reference/builder/
#
# You can use a .dockerignore file in the same context directory as
# your Dockerfile to ignore files in the context before sending them
# to the Docker daemon for building to speed up building.
from pprint import pprint as pp
from flask import Flask, request, jsonify
app = Flask(__name__)
@app.route('/mpesaHook', methods=['POST'])
def mpesa_hook():
print('\n\n--- Received M-Pesa webhook ---\n\n')