SourceTree
環境 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 …
環境 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 …