gistfile1.sh

crispin:node cmlacy$ git remote show
Hubert
engine-deployed
engine-developer
faiz
origin
patrick
crispin:node cmlacy$ git checkout master
Switched to branch 'master'
crispin:node cmlacy$ git checkout -b Preview-2-9-2013
Switched to a new branch 'Preview-2-9-2013'
crispin:node cmlacy$ git fetch patrick
remote: Counting objects: 51, done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 39 (delta 33), reused 18 (delta 12)
Unpacking objects: 100% (39/39), done.
From github.com:PatrickMcGuinness/Engine-Developer
   31e4e95..f270bc7  pjm-jan20  -> patrick/pjm-jan20
crispin:node cmlacy$ git pull patrick pjm-jan20
From github.com:PatrickMcGuinness/Engine-Developer
 * branch            pjm-jan20  -> FETCH_HEAD
Auto-merging node/services/translators/imap/ImapMessageTranslator.js
CONFLICT (content): Merge conflict in node/services/translators/imap/ImapMessageTranslator.js
Auto-merging node/package.json
Automatic merge failed; fix conflicts and then commit the result.
crispin:node cmlacy$ open services/translators/imap/ImapMessageTranslator.js 
crispin:node cmlacy$ git commit -a
[Preview-2-9-2013 75854ab] Merge branch 'pjm-jan20' of github.com:PatrickMcGuinness/Engine-Developer into Preview-2-9-2013
crispin:node cmlacy$ git fetch origin
From github.com:curtislacy/Engine-Developer
 * [new branch]      PR131      -> origin/PR131
crispin:node cmlacy$ git pull origin Fix-Unsubscribe-Button-Column
From github.com:curtislacy/Engine-Developer
 * branch            Fix-Unsubscribe-Button-Column -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 node/views/admin/email.ejs |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
crispin:node cmlacy$ git pull origin Add-Implicit-Contact-Service-Name
From github.com:curtislacy/Engine-Developer
 * branch            Add-Implicit-Contact-Service-Name -> FETCH_HEAD
Auto-merging node/services/translators/imap/ImapMessageTranslator.js
Merge made by the 'recursive' strategy.
 node/services/translators/imap/ImapMessageTranslator.js |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
crispin:node cmlacy$ git pull origin Tsall-Broke
From github.com:curtislacy/Engine-Developer
 * branch            Tsall-Broke -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 node/controllers/AccountsController.js                                |    9 ++++++++-
 node/controllers/ProxyController.js                                   |    2 +-
 node/services/Log.js                                                  |    4 ++--
 node/services/producers/ProducerBase.js                               |    4 ++--
 node/services/producers/appdotnet/AppDotNetUserProfileProducer.js     |    1 +
 node/services/translators/facebook/FacebookContactListTranslator.js   |    2 +-
 node/services/translators/flickr/FlickrContactListTranslator.js       |    2 +-
 node/services/translators/github/GithubContactListTranslator.js       |    2 +-
 node/services/translators/instagram/InstagramContactListTranslator.js |    2 +-
 node/services/translators/linkedin/LinkedInContactListTranslator.js   |    2 +-
 node/services/translators/rdio/RdioContactListTranslator.js           |    2 +-
 node/services/translators/tumblr/TumblrContactListTranslator.js       |    2 +-
 node/services/translators/yammer/YammerContactListTranslator.js       |    2 +-
 node/views/accounts/refresh.ejs                                       |    2 +-
 node/views/users/info.ejs                                             |   10 +++++++---
 15 files changed, 30 insertions(+), 18 deletions(-)
crispin:node cmlacy$ git push origin Preview-2-9-2013
Counting objects: 182, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (141/141), done.
Writing objects: 100% (141/141), 20.85 KiB, done.
Total 141 (delta 114), reused 0 (delta 0)
To git@github.com:curtislacy/Engine-Developer.git
 * [new branch]      Preview-2-9-2013 -> Preview-2-9-2013
crispin:node cmlacy$