Git: cannot do a partial commit during a merge (SourceTree)

After updating the SourceTree to it’s latest version I am fighting with this issue. Assume following scenario:

There are file A, B and C under the version control and there is just one branch. In my working copy, I make some changes to the file A so it turns into a A’ as well as the file B to B’. Someone else in his working copy makes a change to the file C -> C’.

I stage and commit my changes to the file B only. So I have a new revision: A, B’, C and working copy A’, B’, C.

The other one commits his changes, so he makes a revision A, B, C’ and pushes it to the origin.

And here it comes. When I perform the pull, I get some merge changes (the C’). And I want to commit a revision consisting of A, B’, C’. I do not want to do now anything with the modified file A. However, the GIT, SourceTree resp., fails with:

fatal: cannot do a partial commit during a merge.

untill I stage or discard changes to the file A.

I am pretty sure the some previous version of SourceTree did not expose this behavior.

Update 2017/05

It appears in the most recent SourceTree version 2.0.20.1 this issue has been resolved. However, be sure you want to update to this version, because it contains lot of “bugs” (new features) I really dislike.

Related Posts:

  1. Get changes from master into branch in Git
  2. How do I discard unstaged changes in Git?
  3. Git: How do I force “git pull” to overwrite local files?
  4. How can I make git accept a self signed certificate?
  5. How can I revert multiple Git commits (already pushed) to a published repository?
  6. Undo git pull, how to bring repos to old state
  7. What is the difference between ‘git pull’ and ‘git fetch’?
  8. Undo git pull, how to bring repos to old state
  9. Git: How do I force “git pull” to overwrite local files?
  10. What is the meaning of git reset –hard origin/master?
  11. Why does ‘git commit’ not save my changes?
  12. How can I undo git reset –hard HEAD~1?
  13. git push to specific branch
  14. How to interactively (visually) resolve conflicts in SourceTree / git
  15. Rebasing remote branches in Git
  16. What is the Git equivalent for revision number?
  17. difference between git merge origin/master and git pull
  18. How do I delete a Git branch locally and remotely?
  19. How do I delete a Git branch locally and remotely?
  20. How do I rename a local Git branch?
  21. How do I undo the most recent local commits in Git?
  22. What is the best (and safest) way to merge a Git branch into master?
  23. Git: How do I force “git pull” to overwrite local files?
  24. Differences between git pull origin master & git pull origin/master
  25. Undo a Git merge that hasn’t been pushed yet
  26. How do I rename a local Git branch?
  27. How can I switch to another branch in git?
  28. Git merge hotfix branch into feature branch
  29. Abort a Git Merge
  30. How do I discard unstaged changes in Git?
  31. Download single files from GitHub
  32. How to resolve merge conflicts in a Git repository
  33. How can I merge multiple commits onto another branch as a single squashed commit?
  34. How can I merge multiple commits onto another branch as a single squashed commit?
  35. Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch
  36. Git – remote: Repository not found
  37. Git: How to squash all commits on branch
  38. The following untracked working tree files would be overwritten by merge, but I don’t care
  39. The following untracked working tree files would be overwritten by merge, but I don’t care
  40. What does “Git push non-fast-forward updates were rejected” mean?
  41. Git error on commit after merge – fatal: cannot do a partial commit during a merge
  42. Is there a “theirs” version of “git merge -s ours”?
  43. How can I reset or revert a file to a specific revision?
  44. Else clause on Python while statement
  45. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  46. The following untracked working tree files would be overwritten by merge, but I don’t care
  47. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  48. Is there a “theirs” version of “git merge -s ours”?
  49. Delete all local git branches
  50. ‘cannot open git-upload-pack’ error in Eclipse when cloning or pushing git repository
  51. Set up git to pull and push all branches
  52. Invalid VCS root mapping – 3 errors on my project
  53. Updates were rejected because the remote contains work that you do not have locally
  54. how to reset develop branch to master
  55. Do I commit the package-lock.json file created by npm 5?
  56. SourceTree keeps asking for Github password
  57. Is it possible to pull just one file in Git?
  58. How to resolve git status “Unmerged paths:”?
  59. How to keep a branch synchronized/updated with master?
  60. Resolve Git merge conflicts in favor of their changes during a pull
  61. Found a swap file by the name
  62. How can I see the changes in a Git commit?
  63. Is there a git-merge –dry-run option?
  64. Git pull – Please move or remove them before you can merge
  65. Sourcetree adding files in global .gitignore, not in repository .gitignore
  66. How can I delete all Git branches which have been merged?
  67. I use SourceTree with Git but need to work with SVN repistory, what options do I have?
  68. What’s a good (free) visual merge tool for Git? (on windows)
  69. Getting Started with Subversion, Git, or similar Version Control System to keep a History of my Files? [closed]
  70. Should I use SVN or Git?
  71. WordPress Health Tool reporting version control as a critical issue
  72. storing database in version control
  73. Is it better to create a Git repository at the root level or in the WordPress theme directory?
  74. Pull latest stable release via git [closed]
  75. How should I be handling my theme version numbering?
  76. Version control with a team of non-developers
  77. Painless way to track remote Git repo for WordPress updates
  78. Questions about Git and WordPress [duplicate]
  79. How to rename the wp-config.php file once under version control?
  80. How to use one git (github) repository for version control for multiple themes
  81. version control for wordpress? (wordpress folder and database at same time)
  82. Revision History for Entire WordPress Site
  83. WordPress and Git: How does Git interact with your IDE? [closed]
  84. How to use Git Revert
  85. How do I properly force a Git push?
  86. How to remove local (untracked) files from the current Git working tree
  87. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  88. How do I rename both a Git local and remote branch name?
  89. Hard reset of a single file
  90. Not a valid object name: ‘master’
  91. “Unable to find remote helper for ‘https'” during git clone
  92. How to change the license for a project at Github?
  93. Specify an SSH key for git push for a given domain
  94. How do I “un-revert” a reverted Git commit?
  95. git push not send changes to remote git repository
  96. How to use Git and Dropbox together?
  97. Git: Where exactly is the “working directory”?
  98. Setting up Version Control for WordPress plugin development
  99. SymmetricDS in dev + prod workflow?
  100. How to make a copy of a local wordpress build in MAMP?

Leave a Comment