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

fix roles/Cargo.lock #872

Merged
merged 1 commit into from Apr 26, 2024
Merged

Conversation

plebhash
Copy link
Collaborator

apparently #871 still didn't fix roles/Cargo.lock

if we do (on an updated dev branch):

cd roles
cargo build

then roles/Cargo.lock changes state:

git status
On branch dev
Your branch is up to date with 'origin/dev'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   Cargo.lock

This issue has been going on for a while and is quite annoying because it keeps creating conflicts on history.

So now I just did:

git checkout -b fix-cargo-lock
git add Cargo.lock
git commit
git push plebhash fix-cargo-lock
# crate this PR

hopefully this PR fixes this issue once and for all.

@plebhash plebhash merged commit 60465ad into stratum-mining:dev Apr 26, 2024
9 checks passed
@plebhash plebhash deleted the fix-cargo-lock branch April 26, 2024 22:06
plebhash added a commit that referenced this pull request May 2, 2024
Fi3 pushed a commit to Fi3/stratum-1 that referenced this pull request May 3, 2024
Fi3 pushed a commit to Fi3/stratum-1 that referenced this pull request May 3, 2024
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.

None yet

2 participants