| #!/bin/bash | |
| # | |
| # Purpose: manually associate missed renames in merge conflicts | |
| # | |
| # Usage: git merge-associate <our-target> <base> <theirs> | |
| # | |
| # Example: After a failed rename detection A/a -> B/b which results | |
| # in CONFLICT (delete/modify) for A/a and corresponding "deleted by us" | |
| # messages in git status, the following invocation can be used to manually | |
| # establish the link: |
Use Dropbox for a git repository in the cloud. I use it for backup purposes.
It's important to use --bare to create a bare repo (without working copy) instead of a normal one, because git will complain about pushing to the working branch otherwise.
References:
PRs are a great way of sharing information, and can help us be aware of the changes that are occuring in our codebase. They are also an excellent way of getting peer review on the work that we do, without the cost of working in direct pairs.
Ultimately though, the primary reason we use PRs is to encourage quality in the commits that are made to our code repositories
Done well, the commits (and their attached messages) contained within tell a story to people examining the code at a later date. If we are not careful to ensure the quality of these commits, we silently lose this ability.
| #!/usr/bin/env sh | |
| set -e | |
| export TEST_SQL="select user || ' connection to ' || (select current_database()) || ' ✅'" | |
| ### GET CONNECTION DETAILS AND TEST IT | |
| echo "First please provide superuser credentials and endpoint" |