| <!doctype html> | |
| <title>Site Maintenance</title> | |
| <style> | |
| body { text-align: center; padding: 150px; } | |
| h1 { font-size: 50px; } | |
| body { font: 20px Helvetica, sans-serif; color: #333; } | |
| article { display: block; text-align: left; width: 650px; margin: 0 auto; } | |
| a { color: #dc8100; text-decoration: none; } | |
| a:hover { color: #333; text-decoration: none; } | |
| </style> |
| git checkout better_branch | |
| git merge --strategy=ours master # keep the content of this branch, but record a merge | |
| git checkout master | |
| git merge better_branch # fast-forward master up to the merge | |
| ---------------------- | |
| If you want your history to be a little clearer, I'd recommend adding some information to the merge commit message to make it clear what you've done. Change the second line to: |
Code is clean if it can be understood easily – by everyone on the team. Clean code can be read and enhanced by a developer other than its original author. With understandability comes readability, changeability, extensibility and maintainability.
| #!/usr/bin/env bash | |
| # Setup default values for variables | |
| VERSION="3.2.0" | |
| CLUSTER=false | |
| SERVICE=false | |
| TASK_DEFINITION=false | |
| MAX_DEFINITIONS=0 | |
| IMAGE=false | |
| MIN=false |
| import { Queue } from "@aws-cdk/aws-sqs"; | |
| import { App, Duration, Stack, StackProps } from "@aws-cdk/core"; | |
| import { Runtime, Code, Function } from "@aws-cdk/aws-lambda"; | |
| import { SqsEventSource } from "@aws-cdk/aws-lambda-event-sources"; | |
| class DeadLetterQueue extends Stack { | |
| constructor(parent: App, name: string, props?: StackProps) { | |
| super(parent, name, props); |
