mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-01-17 21:38:22 +01:00
Code Issues Projects Releases Wiki Activity

prefer

Browse Source
This commit is contained in:
Tomas Votruba 2018-05-13 23:13:33 +02:00
parent 32a70dce1c
commit 654fea839c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/publish-prefixed-rector.sh
View File

@ -19,6 +19,6 @@ git fetch origin # Updates origin/master
#git rebase origin/master # Rebases current branch onto origin/master
# https://demisx.github.io/git/rebase/2015/07/02/git-rebase-keep-my-branch-changes.html
git rebase -Xours origin/master # Rebases current branch onto origin/master, prefers our "master" in conflicts
git rebase -Xtheirs origin/master # Rebases current branch onto origin/master, prefers our "master" in conflicts
git push origin master