Skip to content

Instantly share code, notes, and snippets.

@artisandhq

artisandhq/merge.md

Last active March 16, 2021 07:16
Show Gist options
  • Save artisandhq/fe0190c7eb5793f2489b294292da991a to your computer and use it in GitHub Desktop.
Save artisandhq/fe0190c7eb5793f2489b294292da991a to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. artisandhq revised this gist Mar 16, 2021. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,5 @@
    ```git checkout master
    ```
    git checkout master
    git pull origin master
    git merge test
    git push origin master
  2. artisandhq revised this gist Mar 16, 2021. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,5 @@
    ```git checkout master
    git pull origin master
    git merge test
    git push origin master```
    git push origin master
    ```
  3. artisandhq revised this gist Mar 16, 2021. 1 changed file with 2 additions and 2 deletions.
    4 changes: 2 additions & 2 deletions merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    ``git checkout master
    ```git checkout master
    git pull origin master
    git merge test
    git push origin master``
    git push origin master```
  4. artisandhq revised this gist Mar 16, 2021. 1 changed file with 4 additions and 4 deletions.
    8 changes: 4 additions & 4 deletions merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    git checkout master
    git pull origin master
    git merge test
    git push origin master
    ``git checkout master
    git pull origin master
    git merge test
    git push origin master``
  5. artisandhq revised this gist Mar 16, 2021. 1 changed file with 4 additions and 4 deletions.
    8 changes: 4 additions & 4 deletions merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    `git checkout master
    git pull origin master
    git merge test
    git push origin master`
    git checkout master
    git pull origin master
    git merge test
    git push origin master
  6. artisandhq created this gist Mar 16, 2021.
    4 changes: 4 additions & 0 deletions merge.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,4 @@
    `git checkout master
    git pull origin master
    git merge test
    git push origin master`