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

finish moving all crates into the crates directory #2161

Merged
merged 6 commits into from
May 23, 2022

Conversation

bmwill
Copy link
Contributor

@bmwill bmwill commented May 23, 2022

This finishes up the migration to having all crates be defined in the crates/ directory

@patrickkuo
Copy link
Contributor

Can we hold this off for a few days unless it’s blocking other work? It will be hard to rebase for my PR :|

@bmwill
Copy link
Contributor Author

bmwill commented May 23, 2022

Can we hold this off for a few days unless it’s blocking other work? It will be hard to rebase for my PR :|

Given there are very few actual code changes in this PR (just moving code around) you really shouldn't see very many conflicts. Git should be able to understand that the files moved and apply your changes to the moved files.

At some point we're going to have to rip the band-aid off though and I'd rather get these things in sooner rather than later

@mystenmark
Copy link
Contributor

Maybe we can try rebasing @patrickkuo's branch onto this branch first to verify the "it shouldn't generate many conflicts" theory? I know git is supposed to do what you say, but I feel like its iffy in practice

@bmwill
Copy link
Contributor Author

bmwill commented May 23, 2022

I'll commit to handle any merge conflicts if they do arise. In fact I'll do that immediately once this lands and push the changes somewhere for @patrickkuo to look at

@bmwill
Copy link
Contributor Author

bmwill commented May 23, 2022

As it turns out the PR in question #2087 already has merge conflicts with the tip of main. These are due to some changes I made over the weekend to merge fullnode and validator into a single binary.

@bmwill bmwill merged commit a4d004b into MystenLabs:main May 23, 2022
@bmwill bmwill deleted the crates branch May 23, 2022 22:50
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