How sync linux nodejs repo with master repo in bitbucket

Asked Mar 09 '22 at 19:32

Active Mar 09 '22 at 19:32

Viewed 19 times

I´d like to sync my local linux repo server with remote bitbucket repo.

I am getting the next message:

luiz@vmi548446:/home/luiz/nuxt-iclindoctor-server$ sudo git pull
Password for 'https://aaae@bitbucket.org':
remote: Enumerating objects: 19, done.
remote: Counting objects: 100% (19/19), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 8), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (12/12), done.
From https://bitbucket.org/jwese/xxx
   829c700..7010ecf  master     -> origin/master
Updating 829c700..7010ecf
error: Your local changes to the following files would be overwritten by merge:
        package-lock.json
        package.json
Please commit your changes or stash them before you merge.
Aborting

How could I solve it? I have no problem if the package.json will be overwritten

asked Mar 09 '22 at 19:32

Luiz Alves

2,575
4
34
75

1

The second last line of the printout suggests committing first – Tony Liu Mar 09 '22 at 19:37
But, I´d like overwrite all files in my local repo – Luiz Alves Mar 09 '22 at 19:39
1

You can use git reset to *delete* changes since last commit. Be sure that you want this before attempting. – Tony Liu Mar 09 '22 at 19:42
https://stackoverflow.com/search?q=%5Bgit%5D+Please+commit+your+changes+or+stash+them+before+you+merge – phd Mar 09 '22 at 20:30

How sync linux nodejs repo with master repo in bitbucket

0 Answers0