git-process-drupal.md

Inspired by this article

If working with no fork and a remote called origin

1. create your feature branch

# grab the latest from origin/master
git pull --rebase origin master
 
# create your feature branch
git checkout -b 123-wine-validations

2. commit your changes

# stage and commit your changes to feature branch
git add -p
git commit -m "123: Feat(wine model) - adding validations"

3. deploy changes to dev for internal review

# rebase from origin/master and resolve any conflicts
git pull --rebase origin master

# push changes to your branch
git push origin 123-wine-validations

# Open a PR to dev and wait for validation for testing.
# Once authorized for testing, ensure there's no conflicts
# Merge your branch to dev manually  without using the ** "Merge pull request"** of github
# /!\ dont merge dev branch in your dedicated branch
git fetch origin
git checkout dev
git reset --hard origin/dev
git merge 123-wine-validations
# resolve conflicts if any
# then push to validate PR
git push dev

# It will be deployed to dev.dkr

4. deploy changes to int.dkr

# Open a PR to master
# Once merged by Metacoaching Team, it will be deployed to int.dkr

5. deploy changes to production

# Manually deploy master branch
# Or run the Ansible script (as of now the inventory should be added)