A command to accept all combination

[BABA983]

Close #205073

accept-all-combination-demo.1.mp4

[hediet]

Thanks for the PR!

Using ActionsSource looks quite weird though.
Can you use a single transaction to set the state of all hunks?

transaction((tx) => {
	model.setState(
		modifiedBaseRange,
		state.withInputValue(1, false),// modify to include both
		true,
		tx
	);
	model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
});

[BABA983]

I have some updates on this PR.

Using ActionsSource looks quite weird though.

At first, my idea was that this command would just like simulate the user clicking on these accept combination buttons, so I just reusedActionsSource.

Now we do it in a single transaction.

model.telemetry.reportRemoveInvoked(1, state.includesInput(2));

The telemetry report I change to the same one in ActionSource

model.telemetry.reportSmartCombinationInvoked(state.includesInput(2));

[hediet]

Thanks!

[Hugothms]

Hey Baba,
Great job thanks for that ! 🙏
Do you think you could add a command to apply the "accept all combination" command to ALL files with merge conflicts ? (in another PR maybe 😇)
Thanks & have a great day ☀️

[BABA983]

Hey Baba, Great job thanks for that ! 🙏 Do you think you could add a command to apply the "accept all combination" command to ALL files with merge conflicts ? (in another PR maybe 😇) Thanks & have a great day ☀️

Thank you for your kind words!

I think adding a command to apply the "accept all combination" to all files with merge conflicts is cool.

But that is not something I can decide. It's better to let VSCode team decide if we should add this into it.

You can fire a feature request.

[SafariMonkey]

Rather than adding a command, I think it would make more sense to add it to the right-click menu on the source control pane, alongside the existing menu entries called something like "Accept All Current" and "Accept All Incoming". Then, accepting all combination can be done by selecting all files, right-clicking, and selecting the option. Files with conflicts not resolvable with "Accept Combination" should have those conflicts left unresolved, and should still be in the "Merge Changes" section.

[mia-petkovic]

It would really be great to have this feature. How come there are not enough reviewers?

[BABA983]

It would really be great to have this feature. How come there are not enough reviewers?

This PR was approved previously however, after VSCode shipped with the ESM module, I pushed some code to fix the conflict, I guess this will get merged into january?

[BABA983]

@hediet Maybe we can merge into the main branch in February?

[Trass3r]

Any updates?