You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

3 lines
67 B

#!/bin/bash
git fetch origin master
git merge -s ours origin/master