Have you ever tried to merge two branches only to end up in conflict hell? You fix a bunch of conflicts only to run git merge --continue and be presented with the same conflicts. Repeat this process and after a few iterations you give up because it just isn't worth the pain and effort.
Would you be surprised to know that there is a git feature specifically for this problem? It's called rerere and I'm going to enrich your life with it now. (I'm going to talk specifically about merging but I think it also helps rebasing)
rerere stands for Reuse Recorded Resolution. The TL;DR version is you ask git to remember how you've resolved hunks in the past, and if the same one comes up for a file in future just redo what you did last time.
To enable this feature just run this lovely command git config --global rerere.enabled true. You can also turn it on by creating this directory in your projects .git/rr-cache, although the global setting is much clearer.
I'll try to take you through an example of how th
| #!/bin/bash | |
| echo "Setting up and running e2e tests!" | |
| # Create database and seed (since we might want to include some data needed for our app to work properly like oauth clients | |
| rails db:setup | |
| # Start puma server in e2e environment on meta-address host on port 5001 in detached mode | |
| RAILS_ENV=e2e puma -b tcp://0.0.0.0:5001 -d |
| class FBGroupMemberRemover { | |
| constructor() { | |
| this.adminText = 'Admin'; | |
| this.removeMemberModalHeadingText = 'Remove Member'; | |
| this.memberElementSelector = '[data-name="GroupProfileGridItem"]'; | |
| this.memberContextMenuSelector = 'button[aria-label="Member Settings"]'; | |
| this.removeMemberButtonSelector = 'a[data-testid="leave_group"]' | |
| this.removalOptions = { |
| version: '2' # Version of composer | |
| services: | |
| backend: # Backend container | |
| build: | |
| context: ~/backend # Backend should be pulled by git to this location | |
| dockerfile: docker/Dockerfile.e2e # The location of Dockerfile, relative to context above | |
| depends_on: # The containers below will be resolved and loaded before backed | |
| - redis | |
| - postgres | |
| - frontend |
| ## Real app image | |
| FROM nginx:alpine # Remove 'as app' | |
| COPY nginx.conf /etc/nginx/nginx.conf | |
| EXPOSE 3000 |
| ## specify node version | |
| FROM quay.io/netguru/ng-node:6 as builder # First 'FROM', as builder is used as reference below | |
| ## add necessary environments | |
| ENV NODE_ENV staging # Set env var | |
| ## add code & build app | |
| ADD . $APP_HOME # Copy / add external source to image's filesystem | |
| RUN yarn install # Install all dependencies for frontend app | |
| RUN yarn build # Compile frontend build |
| { | |
| "workbench.colorCustomizations": { | |
| "terminal.foreground": "#839496", | |
| "terminal.background": "#002833", | |
| "terminal.ansiBlack": "#003541", | |
| "terminal.ansiBlue": "#268bd2", | |
| "terminal.ansiCyan": "#2aa198", | |
| "terminal.ansiGreen": "#859901", | |
| "terminal.ansiMagenta": "#d33682", | |
| "terminal.ansiRed": "#dc322f", |
The below article will cover the intricacies of setting up databases and heroku in respect to a flask app. This is more like a memo and will have out of sequence instructions or solutions to errors so read thoroughly.
You'll need the packages
| This builds off the excellent work of @lmarkus. | |
| The scripts below can be used in conjunction with the Slack Emoji Tools Google Chrome extension to export emojis from | |
| one Slack team and import into another team. | |
| Original work here: https://gist.github.com/lmarkus/8722f56baf8c47045621 |
