Closed aniketshirodkar closed 10 months ago
@aniketshirodkar There's some merge conflicts here - this is partly because you are merging into main
instead of dev
. See what merge conflicts come after changing that. VSCode has a good interface for resolving the merge conflicts.