diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 1af43d3..e9636fc 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -28,11 +28,13 @@
{{ post.excerpt }}
- {%- endif -%} - {%- include post-meta.html post = post -%} -{{ post.excerpt }}
+ {%- endif -%} + {%- include post-meta.html post = post -%} +Instance + | +Branch + | +Description, Instructions, Notes + | +
Stable + | +stable + | +Accepts merges from Working and Hotfixes + | +
Working + | +master + | +Accepts merges from Features/Issues and Hotfixes + | +
Features/Issues + | +topic-* + | +Always branch off HEAD of Working + | +
Hotfix + | +hotfix-* + | +Always branch off Stable + | +
When it comes to the code, you'll be working under the engage-2-x directory ~/Local Sites/mediaengagementorg/app/public/wp-content/themes/engage-2-x
. It will take some time to get used to the structure and knowing where in the code you need to access for your project. To help get you going in the right direction, if the change you're making is to the front-end you'll want to look inside the templates folder and SCSS under assets. Backend logic and querying happen inside of PHP files, the src folder has a lot of it, but there are some lose PHP files out and about.
Check out the Theme Structure section for more info.
-- If you are re-adding the origin and get a `Remote origin already exists` error run: +Instance - | -Branch - | -Description, Instructions, Notes - | -
Stable - | -stable - | -Accepts merges from Working and Hotfixes - | -
Working - | -master - | -Accepts merges from Features/Issues and Hotfixes - | -
Features/Issues - | -topic-* - | -Always branch off HEAD of Working - | -
Hotfix - | -hotfix-* - | -Always branch off Stable - | -