Merge without commit feature needed

103 votes

GitKraken will perform a merge without a commit if there is a conflict, however I would like to be able to review and potentially unstage certain diffs before instructing GitKraken to continue with the merge and commit.

I realize GitKraken already has a merge conflict editor, what I want is to perform a merge and enter into this state even if there are not merge conflicts. This would allow me to be able to unstage parts of the merge I don't to commit.

Under consideration Suggested by: Michael (08 Oct, '21) • Upvoted: 11 Apr • Comments: 17

Comments: 17

18 Feb, '22
Nathan C. Sherman
I'd like the ability to micromanage a merge or rebase even when there is no conflict, just to review every change.
1
25 Mar, '22
Julio Mateos
I need manage the files to add in the merge, and not all if there isn’t conflict (if there are conflicts its posible manage!!!); this is a very important feature and it’s used a lot of times developing. Any basic git client include this feature. Regards.
15 Apr, '22
Clancey English
Upvote for this. As a temporary workaround, you can merge and then immediately perform an undo. This will land you in the same state you would be in for a merge preview before committing.
20 May, '22
Greg Creager
Yes please give us this functionality, already do this on cherry pick and revert where we have the option to say no to auto commit.
11 Jan, '23
zip
yes please i needed that today and i was only able to do so by git command "--no-commit"
13 Jan, '23
Paul Galbraith
Yes please, I'm disappointed I need to resort to command line or other tools to do this.
15 Mar, '23
Plamen
This only will make me switch to another git client GUI, seriously. It is so annoying. Actually I AM switching as I type. Thanks.
05 Apr, '23
Erik
Really needed due to workflow at my company, need some just-before-commit edits.
Meanwhile thx to Clancey English for the workaround
13 Apr, '23
Ian
Please add this feature.
05 May, '23
Andres Vaquero
I am here too!
22 Jun, '23
Michel
Please add this! :-)
31 Jul, '23
ChrisM
This would be very helpful! Is needed for the workflow in my company where we merge in a branch and then edit some files before final commit.
31 Jul, '23
Bruce
IT would be very handy to have a merge preview option. the ability to see what would happen if you were to merge one branch int another before actually doing it.
11 Aug, '23
Adam Bordelon
I would Like to add To this Thread to bring it back to the forefront of discussion.. Right now I'm manually running the --no-commit in terminal for this kind of Merge. It would be an easy to add quality of life improvement
08 Sep, '23
Nij
Yeah; I really need this too! *Some* of our config files are in version control, and if someone commits their changes specific to a branch into their branch... well they get merged wholesale into the trunk without an ability to filter out specific files (or hunks).
(I'd tried the Undo trick noted above, which is helpful, but I think it results in losing the record that the branch was merged back into the trunk / develop branch... that leads me to worry that a branch has not been merged!)
30 Sep, '23
Nathan L.
Any update on this feature?

This would be extremely beneficial. I am finding that sometimes changes are not detected properly and it's painful to try and get them correct, especially when there are multiple branches that need to be merged together.
07 Jan
Soroush
I just bought the Pro license and didn't know this was a missing feature. I would have definitely decided against buying the license knowing this basic feature is missing. please consider adding this, even Fork has this and Fork is free. this suggestion is two years old.