kbowers-ibm commented on code in PR #2188: URL: https://github.com/apache/incubator-kie-tools/pull/2188#discussion_r1555344547
########## pnpm-lock.yaml: ########## Review Comment: Steps I follow to merge with main: (From local main) Sync main branch with upstream apache/incubator-kie-tools git pull git checkout kie-issues#950 git merge main (if no merge conflicts will git push kbowers-ibm kie-issues#950 and will automatically have a commit message like "Merge branch 'main' into kie-issues#950") In this case there were merge conflicts with lock file, so pressed "Accept theirs" for everything. I'm not too familiar with the vscode conflict resolver though, so afterwards I ran: git checkout main -- /home/kbowers-ibm/projects/kie-tools/pnpm-lock.yaml pnpm bootstrap -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
