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.

Sign up for GitHub

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

Jump to bottom

Resolve with locked versions #779

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Resolve with locked versions #779

merged 1 commit into from
Oct 17, 2023

Conversation

maciektr
Copy link
Contributor

@maciektr maciektr commented Oct 10, 2023 •
edited
Loading

commit-id:2fd1f61f

Stack:

⚠️ Part of a stack created by spr. Do not merge manually using the UI - doing so may have unexpected results.

This was referenced Oct 10, 2023
Merged
Merged
Merged
Merged
@maciektr maciektr mentioned this pull request Oct 10, 2023
Merged
@maciektr maciektr marked this pull request as ready for review October 10, 2023 15:31
@maciektr maciektr requested a review from mkaput as a code owner October 10, 2023 15:31
@maciektr maciektr force-pushed the spr/main/2fd1f61f branch 3 times, most recently from 1d9dc6b to 0b9716b Compare October 10, 2023 15:54
github-merge-queue bot pushed a commit that referenced this pull request Oct 10, 2023
@maciektr
Ensure git checkout returns existing revision (#775)
95885ad 
commit-id:48d35381

---

**Stack**:
- #781
- #780
- #779
- #778
- #777
- #775 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*
@maciektr maciektr force-pushed the spr/main/5ad45dc3 branch 2 times, most recently from 2866c3c to f829fd0 Compare October 11, 2023 15:36
@maciektr maciektr force-pushed the spr/main/2fd1f61f branch 2 times, most recently from 8a6e646 to eb83e68 Compare October 11, 2023 19:35
mkaput
mkaput requested changes Oct 12, 2023
View reviewed changes
website/docs/guides/dependencies.md Show resolved Hide resolved
scarb/src/core/manifest/version_req.rs Show resolved Hide resolved
scarb/src/core/manifest/dependency.rs Outdated Show resolved Hide resolved
scarb/src/core/source/id.rs Outdated Show resolved Hide resolved
scarb/src/core/source/id.rs Outdated Show resolved Hide resolved
@maciektr maciektr changed the base branch from spr/main/5ad45dc3 to main October 16, 2023 23:32
@maciektr maciektr mentioned this pull request Oct 16, 2023
Merged
@maciektr maciektr changed the base branch from main to spr/main/5ad45dc3 October 16, 2023 23:32
github-merge-queue bot pushed a commit that referenced this pull request Oct 17, 2023
@maciektr
Add lockfile structure (#777)
c265190 
commit-id:a905a9c2

---

**Stack**:
- #781
- #800
- #780
- #779
- #778
- #777 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Co-authored-by: MrDenkoV <stanislaw.denkowski@swmansion.com>
Base automatically changed from spr/main/5ad45dc3 to main October 17, 2023 16:19
github-merge-queue bot pushed a commit that referenced this pull request Oct 17, 2023
@maciektr @MrDenkoV
Generate lock files (#778)
8569ab1 
commit-id:5ad45dc3

---

**Stack**:
- #781
- #800
- #780
- #779
- #778 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Co-authored-by: Stanislaw Denkowski <mr.denkov@gmail.com>
@maciektr
Resolve with locked versions
02442ba 
commit-id:2fd1f61f
@maciektr maciektr added this pull request to the merge queue Oct 17, 2023
Merged via the queue into main with commit f45b5ea Oct 17, 2023
@maciektr maciektr deleted the spr/main/2fd1f61f branch October 17, 2023 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkaput mkaput mkaput approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maciektr @mkaput