PS G:\astronova\ecom> git pull origin main --allow-unrelated-histories
git: 'credential-manager-core' is not a git command. See 'git --help'.
From https://github.com/Astronova-Foundation-Nepal/astro-ecomm-frontend
* branch main -> FETCH_HEAD
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging app/Hero.tsx
Auto-merging app/LoginPage.tsx
CONFLICT (add/add): Merge conflict in app/LoginPage.tsx
Auto-merging app/globals.css
CONFLICT (add/add): Merge conflict in app/globals.css
Auto-merging app/layout.tsx
CONFLICT (add/add): Merge conflict in app/layout.tsx
Auto-merging app/page.tsx
CONFLICT (add/add): Merge conflict in app/page.tsx
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging public/circle.svg
CONFLICT (add/add): Merge conflict in public/circle.svg
Auto-merging public/eye.svg

E325: ATTENTION
Found a swap file by the name "/g/astronova/ecom/.git/.COMMIT_EDITMSG.swp"
owned by: Asus dated: Sun Dec 01 12:38:21 2024
file name: /g/astronova/ecom/.git/COMMIT_EDITMSG
modified: YES
user name: Asus host name: DESKTOP-MRU75HB
process ID: 315
While opening file "/g/astronova/ecom/.git/COMMIT_EDITMSG"
dated: Sun Dec 01 16:29:17 2024
NEWER than swap file!

(1) Another program may be editing the same file. If this is the case,
be careful not to end up with two different instances of the same
file when making changes. Quit, or continue with caution.
(2) An edit session for this file crashed.
If this is the case, use ":recover" or "vim -r /g/astronova/ecom/.git/COMMIT_EDITMSG"
to recover the changes (see ":help recovery").
If you did this already, delete the swap file "/g/astronova/ecom/.git/.COMMIT_EDITMSG.swp"