Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: install, uninstall and run 3-way merge driver for Salesforce #3

Open
wants to merge 50 commits into
base: main
Choose a base branch
from

Conversation

scolladon
Copy link
Owner

@scolladon scolladon commented Mar 6, 2025

Explain your changes


Add install, uninstall and run command
Add unit test and nut test
Isolate tripart json algorithm

@scolladon scolladon requested a review from yohanim as a code owner March 6, 2025 17:14
@scolladon scolladon force-pushed the feat/first-version branch from 0673018 to b4c01a3 Compare March 6, 2025 17:35
@scolladon scolladon changed the title feat: install, uninstall and run tripart merge driver for xml feat: install, uninstall and run 3-way merge driver for Salesforce Mar 7, 2025
@scolladon scolladon force-pushed the feat/first-version branch from 436c5e5 to a0caae9 Compare March 7, 2025 21:48
@yohanim
Copy link
Collaborator

yohanim commented Mar 10, 2025

xml Parser options : https://github.com/forcedotcom/source-deploy-retrieve/blob/d41367178ca1e1623865f190fc037401f52b75af/src/utils/metadata.ts#L13
xml builder (avec petite fonction en plus pour correction des commentaires) : https://github.com/forcedotcom/source-deploy-retrieve/blob/d41367178ca1e1623865f190fc037401f52b75af/src/convert/streams.ts#L265

@yohanim
Copy link
Collaborator

yohanim commented Mar 11, 2025

Oups, je ne gère pas encore bien le multicompte GitHub plus ou moins mal géré dans les outils

@scolladon
Copy link
Owner Author

Oups, je ne gère pas encore bien le multicompte GitHub plus ou moins mal géré dans les outils

Pas de soucis, on regardera ta conf ssh la prochaine fois

@scolladon scolladon force-pushed the feat/first-version branch from e66831b to 7c8e67a Compare March 13, 2025 15:40
@scolladon scolladon force-pushed the feat/first-version branch 2 times, most recently from 0fa8622 to 1d7ca7c Compare March 17, 2025 17:15
@scolladon scolladon force-pushed the feat/first-version branch from 1d7ca7c to 0fa8622 Compare March 21, 2025 09:55
Copy link

Published under dev-3 npm channel.

$ sf plugins install sf-git-merge-driver@dev-3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants