Skip to content

Instantly share code, notes, and snippets.

Keybase proof

I hereby claim:

  • I am ledinhhuan on github.
  • I am huanle (https://keybase.io/huanle) on keybase.
  • I have a public key ASAClqReE0xqvlrcHzIWEsHCtyWE5vBQ86TCnUxY6FaqqQo

To claim this, I am signing this object:

runtime: php
env: flex
runtime_config:
document_root: public
# Ensure we skip ".env", which is only for local development
skip_files:
- .env
env_variables:
@bindevfs
bindevfs / git_workflow_best_practices.md
Created January 11, 2019 04:59 — forked from calaway/git_workflow_best_practices.md
Git Workflow Best Practices

Git Branch Merging Best Practices

  1. After you've selected a feature to work on, create a branch in your local repo to build it in.
    • $ git checkout -b calaway/short_description_of_feature
  2. Implement the requested feature, make sure all tests are passing, and commit all changes in the new branch.
  3. Checkout the master branch locally.
    • $ git checkout master
  4. Pull down the master branch from GitHub to get the most up to date changes from others. If you practice git workflow as described here you should never have a merge conflict at this step.
    • $ git pull origin master
  5. Make sure all tests are passing on master and then checkout your new branch.
  • $ git checkout calaway/short_description_of_feature