Browse Source

Fix merge notice

pull/1/head
Tim Byrne 7 years ago
parent
commit
886c5ada53
  1. 4
      yadm

4
yadm

@ -148,9 +148,11 @@ function clone() { @@ -148,9 +148,11 @@ function clone() {
#; fetch / merge (and possibly fallback to reset)
debug "Doing an initial fetch of the origin"
git fetch origin
debug "Doing an initial merge of origin/master"
git merge origin/master || {
debug "Merge failed, doing a reset."
git reset origin/master
echo <<EOF
cat <<EOF
**NOTE**
Merging origin/master failed.
YADM did 'reset origin/master' instead.

Loading…
Cancel
Save