#!/usr/bin/env bash # vim:ts=4:sts=4:sw=4:et # # Author: Hari Sekhon # Date: 2022-02-17 11:32:45 +0000 (Thu, 17 Feb 2022) # # https://github.com/HariSekhon/DevOps-Bash-tools # # License: see accompanying Hari Sekhon LICENSE file # # If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish # # https://www.linkedin.com/in/HariSekhon # set -euo pipefail [ -n "${DEBUG:-}" ] && set -x srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # shellcheck disable=SC1090 . "$srcdir/lib/github.sh" # shellcheck disable=SC2034,SC2154 usage_description=" Merges one branch into another in the current or given repo, creating and merging Pull Requests for full audit tracking all changes Useful to automate code promotion across environment branches or to automatically backport hotfixes from Production branch to dev / trunk branches Also works across repo forks if the head branch contains an ':' prefix Useful Git terminology reminder: The HEAD branch is the branch you want to merge FROM, eg. 'my-feature-branch' The BASE branch is the branch you want to merge INTO, eg. 'master' or 'main' Requires GitHub CLI to be installed and configured Depends on adjacent script: github_pull_request_create.sh Used by adjacent script: github_repo_fork_update.sh " # used by usage() in lib/utils.sh # shellcheck disable=SC2034 usage_args="[/] " help_usage "$@" min_args 2 "$@" max_args 3 "$@" output="$("$srcdir/github_pull_request_create.sh" "$@")" if [ -n "$output" ]; then url="$(parse_pull_request_url "$output")" timestamp "Merging Pull Request: $url" gh pr merge --merge "$url" echo >&2 fi