Jump to content

PS 1.7.6 package .git repository conflicts


grsinternet
 Share

Recommended Posts

Hello,
we are uploading each project to Git, but all the time we have issues with some vendors:
 

Quote

 

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
  (commit or discard the untracked or modified content in submodules)

    modified:   modules/psaddonsconnect/vendor/guzzlehttp/cache-subscriber (modified content)
    modified:   modules/psaddonsconnect/vendor/guzzlehttp/ringphp (modified content)
    modified:   modules/psaddonsconnect/vendor/guzzlehttp/streams (modified content)
    modified:   modules/psaddonsconnect/vendor/prestashop/circuit-breaker (modified content)
    modified:   modules/psaddonsconnect/vendor/react/promise (modified content)

no changes added to commit (use "git add" and/or "git commit -a")

 

Does anyone have similar problem?  Maybe it would be a good idea to remove .git from these repositories
P.S. this is not starting error I get, but this vendor always conflicts in development...

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...

Important Information

Cookies ensure the smooth running of our services. Using these, you accept the use of cookies. Learn More