Skip to content

Instantly share code, notes, and snippets.

@Tymski
Last active October 16, 2020 11:35
Show Gist options
  • Select an option

  • Save Tymski/6bf20a99fdc78b873e7cbc5ea7a4cb62 to your computer and use it in GitHub Desktop.

Select an option

Save Tymski/6bf20a99fdc78b873e7cbc5ea7a4cb62 to your computer and use it in GitHub Desktop.

Revisions

  1. Tymski revised this gist Oct 16, 2020. 1 changed file with 2 additions and 0 deletions.
    2 changes: 2 additions & 0 deletions Finish feature branch
    Original file line number Diff line number Diff line change
    @@ -1,6 +1,8 @@
    // merge into develop with saving the tree
    git checkout develop
    git pull
    git merge --no-ff feature/myAwesomeFunctionality
    git push

    // delete branch locally
    git branch -d feature/myAwesomeFunctionality
  2. Tymski created this gist Oct 15, 2020.
    7 changes: 7 additions & 0 deletions Create a new feature
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,7 @@
    // Create a bew branch and move there
    git checkout -b feature/myAwesomeFunctionality develop

    // ... Implement the feature, add, commit, as normal

    // push changes
    git push --set-upstream origin feature/myAwesomeFunctionality
    9 changes: 9 additions & 0 deletions Finish feature branch
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,9 @@
    // merge into develop with saving the tree
    git checkout develop
    git merge --no-ff feature/myAwesomeFunctionality

    // delete branch locally
    git branch -d feature/myAwesomeFunctionality

    // delete branch remotely
    git push origin --delete feature/myAwesomeFunctionality