Project

General

Profile

Revision 651f07b1

Added by Julien Enselme about 10 years ago

Auto conflict resolution for sites.php

View differences:

other-scripts/d7-sync.sh
27 27
### sync drupal tree
28 28
git pull --rebase
29 29
git checkout $LOCAL_BRANCH_NAME
30
git rebase master
30
# Auto solve conflicts: it takes the version from master in case of conflict.
31
git rebase master --strategy-option ours
31 32

  
32 33
### sync files
33 34
if [ -z "$1" ] ; then

Also available in: Unified diff