Révision 651f07b1
Ajouté par Julien Enselme il y a environ 10 ans
| 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 |
Formats disponibles : Unified diff
Auto conflict resolution for sites.php