for Smartphone

halclan memo

Top > SourceTree

SourceTree

2016-02-28

fatal: Cannot do a soft reset in the middle of a merge.

SourceTree GitHub

環境 MacOSX 10.11 現象 ※ 今回はSourceTreeで操作. % git add -A % git commit -m "xxx" % git push origin develop fatal: Cannot do a soft reset in the middle of a merge. hint: Updates were rejected because the remote contains work that you do …

Hatena Bookmark - fatal: Cannot do a soft reset in the middle of a merge.
fatal: Cannot do a soft reset in the middle of a merge.
profile
id:hrt0kmt id:hrt0kmt
Subscribed unsubscribe Subscribe Subscribe
search
category
  • vim (11)
  • MySQL (66)
  • Apache (22)
  • Wordpress (12)
  • GitHub (5)
  • ssh (5)
  • UNIX (64)
  • SourceTree (1)
  • HTTP (1)
  • CGI (1)
  • Java (6)
  • Tomcat (2)
  • Underscore.js (27)
  • Elasticsearch (1)
  • gem (3)
  • Beanstalk (1)
  • AWS (4)
  • Mac (1)
  • Linux (2)
  • jenkins (2)
  • Homebrew (12)
  • Network (1)
  • kibana (1)
  • CodeIgniter (5)
  • Android (5)
  • smarty (3)
  • PHP (68)
  • PEAR (10)
  • Composer (1)
  • CSS (47)
  • HTML (21)
  • JavaScript (32)
  • jQuery (12)
  • SFTP (1)
  • Grunt (1)
  • Atom (1)
  • SEO (1)
  • Swift (2)
  • Life (12)
  • GCM (1)
  • Xcode (7)
  • Ruby (9)
  • Pod (1)
  • Go (1)
  • Capybara (13)
  • Selenium (11)
  • RSpec (15)
  • SublimeText (4)
  • Windows (5)
  • Hobby (11)
  • zsh (4)
  • Test (7)
  • MacPorts (41)
  • Appium (3)
  • Node (6)
  • Mockup (2)
  • Movie (2)
  • Responsive (8)
  • Microsoft Office (5)
  • Apache-ant (1)
  • security (4)
  • Dropbox (2)
  • useful (48)
  • Bootstrap (13)
  • 敬語 (3)
  • CSS3 (29)
  • npm (3)
  • XAMPP (3)
  • ImageMagick (1)
  • Imagick (1)
  • Fuel PHP (1)
  • phpMyAdmin (1)
  • 申請 (1)
  • WF (3)
  • svn (3)
  • Excel (1)
  • tmux (2)
  • meta (3)
  • Backbone.js (15)
  • politics (1)
archive
halclan memo halclan memo

Powered by Hatena Blog | ブログを報告する

Star added

Quote saved.

Login to quote this blog

Failed to save quote. Please try again later.

You cannot quote because this article is private.

Subscribed unsubscribe Subscribe Subscribe