Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update .gitignore #184

Closed
wants to merge 1 commit into from
Closed

Update .gitignore #184

wants to merge 1 commit into from

Conversation

blakadder
Copy link
Contributor

add dependencies.lock to ignore list to allow git pulls

@kristiankielhofner
Copy link
Contributor

Can you describe the steps and better describe (error messages, if any) that cause this issue?

Generally speaking you want to lock the dependencies for the component libraries as obviously any new untested release versions could cause issues. It's the equivalent of requirements.txt in python or package-lock.json in node.

@blakadder
Copy link
Contributor Author

blak@bass:~/willow$ git pull
remote: Enumerating objects: 112, done.
remote: Counting objects: 100% (81/81), done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 112 (delta 74), reused 73 (delta 73), pack-reused 31
Receiving objects: 100% (112/112), 14.40 KiB | 0 bytes/s, done.
Resolving deltas: 100% (77/77), completed with 11 local objects.
From https://github.com/toverainc/willow
   cd8bd95..5046004  main        -> origin/main
 + c5952e2...49722aa feature/was -> origin/feature/was  (forced update)
 * [new branch]      issue/159   -> origin/issue/159
Updating cd8bd95..5046004
error: Your local changes to the following files would be overwritten by merge:
        dependencies.lock
Please commit your changes or stash them before you merge.
Aborting

ran into this today so I had to delete dependencies.lock to pull a new version without other git intervention

@stintel
Copy link
Collaborator

stintel commented Jun 18, 2023

I'm generally not a fan of keeping auto-generated files under version control, as it frequently causes conflicts, but like @kristiankielhofner mentions, this is considered best practice. Same with Cargo.lock for rust projects.

@stintel
Copy link
Collaborator

stintel commented Jun 18, 2023

We could however do something like I've done here: https://codeberg.org/stintel/auditd-forwarder/commit/252e208e5f4af3b641a62ddd2ceb36e8dd59398d

add dependencies.lock to ignore list to allow git pulls
@stintel
Copy link
Collaborator

stintel commented Aug 18, 2023

Rebased to trigger the CI failure on PRs from forks. Working on a fix for that.

stintel added a commit that referenced this pull request Nov 22, 2023
As explained by Espressif in #324, dependencies.lock is an intermediate
temporary file used during compilation. To use fixed versions, they
should be locked in idf_component.yml, which we already do.

Closes #184
kristiankielhofner pushed a commit that referenced this pull request Nov 22, 2023
As explained by Espressif in #324, dependencies.lock is an intermediate
temporary file used during compilation. To use fixed versions, they
should be locked in idf_component.yml, which we already do.

Closes #184
stintel added a commit that referenced this pull request Nov 22, 2023
As explained by Espressif in #324, dependencies.lock is an intermediate
temporary file used during compilation. To use fixed versions, they
should be locked in idf_component.yml, which we already do.

Closes #184
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants