Merge without commit feature needed
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.
Comments: 15
-
18 Feb, '22
Nathan C. ShermanI'd like the ability to micromanage a merge or rebase even when there is no conflict, just to review every change.
-
25 Mar, '22
Julio MateosI 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 EnglishUpvote 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 CreagerYes 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
zipyes please i needed that today and i was only able to do so by git command "--no-commit"
-
13 Jan
Paul GalbraithYes please, I'm disappointed I need to resort to command line or other tools to do this.
-
15 Mar
PlamenThis 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
ErikReally needed due to workflow at my company, need some just-before-commit edits.
Meanwhile thx to Clancey English for the workaround -
13 Apr
IanPlease add this feature.
-
05 May
Andres VaqueroI am here too!
-
22 Jun
MichelPlease add this! :-)
-
31 Jul
ChrisMThis 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
BruceIT 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
Adam BordelonI 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
NijYeah; 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!)