search

ga-wdi-boston / browser-template-ARCHIVED

CLICK HERE BEFORE YOU USE THIS TEMPLATE: http://i.imgur.com/UmjLrOc.gif
Other
19 stars 132 forks source link

for grunt deploy #96

Open payne-chris-r opened 7 years ago

payne-chris-r commented 7 years ago

consider fetching origin master, then diffing origin master and local master, if (no diff) { pull master }, else { explode }

gaand commented 7 years ago

:robot: :grimacing: but this seems necessary.

That, or we have to teach a non-conflict generating workflow. We might want to do that anyway.

Jcornmanhomonoff commented 7 years ago

@payne-chris-r isn't this sufficient? https://github.com/ga-wdi-boston/browser-template/blob/master/grunt/aliases.json#L7