lvl-svasseur

{
	"id":3208,
	"api_url":"http:\/\/dev2.amctv.com\/sync.amctv\/api\/v1\/",
	"env":"dev2",
	"brightcove":{
		"playerID":"2707479540001",
		"playerKey":"AQ~~,AAABUi-NICE~,rE4iZr1CNrYj6y6VJQWJgC4M56w6sSua"
	},
	"brightcove_ad":{
		"playerID":"2707479541001",

lvl-svasseur

Spec 2.0

Existing barrels

• [common_fields][common_fields.md]
• [image:default][image_default.md]
• [image:quote][image_quote.md]
• [image:clickthrough][image_clickthrough.md]
• [image:document][image_document.md]
• [poll:buttons 2][poll_buttons-2.md]

lvl-svasseur

-Go to the starting point of the project
>> git checkout origin master
-fetch all objects
>> git fetch origin
-Make the branch from the tag
>> git branch new_branch tag_name
-Checkout the branch
>> git checkout new_branch
-Push the branch up
>> git push origin new_branch

lvl-svasseur

{
	"background-image": {
		"2560x1400": {
			"src": "http:\/\/dev.sync.amctv.com\/wp-content\/uploads\/2013\/09\/new-background.jpg",
			"width": "2560",
			"height": "1400"
		}
	},
	"storysync-logo-image": {
		// retina size

lvl-svasseur

# generated
app/app.css
app/ie9.css
app/app.js
app/scripts/config.js
app/images/ui-*.png
test/app.js

#bower
*vendor*

lvl-svasseur

{
    // Details: https://github.com/victorporof/Sublime-JSHint#using-your-own-jshintrc-options
    // Example: https://github.com/jshint/jshint/blob/master/examples/.jshintrc
    // Documentation: http://www.jshint.com/docs/

    // Enforcing
    "indent": 4,
    "quotmark": false,
    "camelcase": true,
    "newcap": true,

lvl-svasseur

# https://gist.github.com/driesvints/5960662
# Ensures all line endings are committed as LF, but will checkout with native line endings
* text=auto

# -- Override Section, just in-case Git tries to be sneaky

# Ensure that these files are recognized as text
*.asp         text
*.aspx        text
*.asx         text

lvl-svasseur

sudo npm cache clean -f
sudo npm install -g n
sudo n stable

lvl-svasseur

git push origin refs/heads/1.1.21:refs/heads/1.1.21

lvl-svasseur

[merge]
    tool = intellij
    # tool = Kaleidoscope
[diff]
    tool = intellij
    # tool = Kaleidoscope
    
# intellij mergetool config
[mergetool "intellij"]
    cmd = /Applications/IntelliJ\\ IDEA\ 13\\ CE.app/Contents/MacOS/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")