Skip to content
Marius OLAR edited this page May 22, 2014 · 1 revision

STEP 1

1.GIT INIT $ git init

2.GIT COMMIT $ git add wp-content $ git commit -m 'initial commit'

3.GIT ADD REMOTE git remote add origin ssh://[email protected]:PressLabs/git-sauce-test.git

4.GIT FETCH REF $ git fetch origin

IF NO REMOTE BRANCH THEN 4.1.TRACK BRANCH 4.2.PUSH

STEP 2

1.GIT MERGE W. ACCEPT MINE git merge -s recursive -X ours

2.GIT PUSH $ git push

3.GIT FETCH REF $ git fetch origin

Clone this wiki locally