Skip to content

Instantly share code, notes, and snippets.

View sproogen's full-sized avatar

James Grant sproogen

88 followers · 4 following
View GitHub Profile
@sproogen
sproogen / merge-downstream.sh
Last active June 29, 2018 12:19
A simple bash script for a Travis CI build to merge changes to the downstream develop branch or create a PR with conflicts
#!/bin/bash
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
git remote set-branches --add origin develop;
git fetch origin develop;
git checkout develop;
git merge master;