?

gistfile1.txt

Windows PowerShell
Copyright (C) 2009 Microsoft Corporation. All rights reserved.

E:\memebig\projects\memeBig [Journal/Action-unstyled-completion]> git checkout m
aster
Switched to branch 'master'
E:\memebig\projects\memeBig [master]> git merge Journal/Action-unstyled-completi
on
Auto-merging public/css/less/journal.less
CONFLICT (content): Merge conflict in public/css/less/journal.less
Auto-merging public/css/less/common.less
Auto-merging public/css/app.css
CONFLICT (content): Merge conflict in public/css/app.css
Auto-merging public/app/utils.js
Auto-merging public/app/rest-service.js
Auto-merging public/app/journal/journal.html
Auto-merging public/app/journal/JournalCtrl.js
CONFLICT (content): Merge conflict in public/app/journal/JournalCtrl.js
Auto-merging public/app/feed/post-tile.html
CONFLICT (content): Merge conflict in public/app/feed/post-tile.html
Auto-merging public/app/feed/feed.html
CONFLICT (content): Merge conflict in public/app/feed/feed.html
Auto-merging public/app/feed/FeedCtrl.js
CONFLICT (content): Merge conflict in public/app/feed/FeedCtrl.js
Auto-merging public/app/action/ActionCtrl.js
Auto-merging notes.txt
CONFLICT (content): Merge conflict in notes.txt
Auto-merging models/user.js
CONFLICT (content): Merge conflict in models/user.js
Auto-merging models/schemas.js
Auto-merging models/post.js
CONFLICT (content): Merge conflict in models/post.js
Auto-merging models/embed.js
CONFLICT (add/add): Merge conflict in models/embed.js
Auto-merging controllers/string-ctrl.js
CONFLICT (add/add): Merge conflict in controllers/string-ctrl.js
Auto-merging controllers/post-ctrl.js
CONFLICT (add/add): Merge conflict in controllers/post-ctrl.js
Auto-merging controllers/feed-ctrl.js
CONFLICT (content): Merge conflict in controllers/feed-ctrl.js
Auto-merging controllers/action-ctrl.js
CONFLICT (content): Merge conflict in controllers/action-ctrl.js
Auto-merging controllers/account-ctrl.js
CONFLICT (content): Merge conflict in controllers/account-ctrl.js
Auto-merging config/routes.js
CONFLICT (content): Merge conflict in config/routes.js
Auto-merging config/images.js
CONFLICT (content): Merge conflict in config/images.js
Automatic merge failed; fix conflicts and then commit the result.
E:\memebig\projects\memeBig [master +8 ~22 -0 !14 | +3 ~0 -0 !14 !]> git status
# On branch master
# You have unmerged paths.
#   (fix conflicts and run "git commit")
#
# Changes to be committed:
#
#       modified:   controllers/journal-ctrl.js
#       modified:   models/schemas.js
#       modified:   public/app/action/ActionCtrl.js
#       modified:   public/app/action/action.html
#       modified:   public/app/app.js
#       modified:   public/app/common/post-tileview.html
#       modified:   public/app/creation/CreateCtrl.js
#       modified:   public/app/creation/post-create-form.html
#       modified:   public/app/crowd/UserTileCtrl.js
#       modified:   public/app/crowd/user-tile.html
#       modified:   public/app/journal/journal.actions.html
#       modified:   public/app/journal/journal.crowd.html
#       modified:   public/app/journal/journal.html
#       modified:   public/app/journal/journal.whys.html
#       modified:   public/app/rest-service.js
#       modified:   public/app/utils.js
#       modified:   public/app/why/why-tile.html
#       modified:   public/css/app.less
#       new file:   public/css/less/action-about.less
#       new file:   public/css/less/action-page.less
#       modified:   public/css/less/common.less
#       modified:   public/css/less/forms.less
#       modified:   public/css/less/mb-bootstrap.less
#       modified:   public/css/less/navigation.less
#       new file:   public/css/less/post-tile.less
#       new file:   public/css/less/user-tile.less
#       new file:   public/css/less/why-tile.less
#
# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      config/images.js
#       both modified:      config/routes.js
#       both modified:      controllers/account-ctrl.js
#       both modified:      controllers/action-ctrl.js
#       both modified:      controllers/feed-ctrl.js
#       both added:         controllers/post-ctrl.js
#       both added:         controllers/string-ctrl.js
#       both added:         models/embed.js
#       both modified:      models/post.js
#       both modified:      models/user.js
#       both modified:      notes.txt
#       both modified:      public/app/feed/FeedCtrl.js
#       both modified:      public/app/feed/feed.html
#       both modified:      public/app/feed/post-tile.html
#       both modified:      public/app/journal/JournalCtrl.js
#       both modified:      public/css/app.css
#       both modified:      public/css/less/journal.less
#
E:\memebig\projects\memeBig [master +8 ~22 -0 !14 | +3 ~0 -0 !14 !]>