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

Typescript changes #114

Merged
merged 1 commit into from
Jan 21, 2022
Merged

Typescript changes #114

merged 1 commit into from
Jan 21, 2022

Conversation

chris-kruining
Copy link

@thesayyn
Copy link
Owner

can you squash them so that they are easy to cherry-pick?

@chris-kruining
Copy link
Author

Pretty sure this should do the trick?

@thesayyn
Copy link
Owner

Yea. thanks a lot. just fixed a lot bazel related stuff. still trying to get windows pass. pain.

@chris-kruining
Copy link
Author

Yea. thanks a lot. just fixed a lot bazel related stuff. still trying to get windows pass. pain.

looking at the error it almost seems like it is looking for the submodule?

@thesayyn thesayyn force-pushed the typescript branch 2 times, most recently from 02003d5 to 339add8 Compare January 21, 2022 15:15
@thesayyn
Copy link
Owner

thesayyn commented Jan 21, 2022

looking at the error it almost seems like it is looking for the submodule?

just permission errors. I give up. I don’t have a windows machine. ngg after its stupid permission errors.

@thesayyn thesayyn force-pushed the typescript branch 4 times, most recently from ebd8686 to bc08070 Compare January 21, 2022 16:12
@thesayyn
Copy link
Owner

thesayyn commented Jan 21, 2022

@chris-kruining the branch is ready. could you rebase and resolve conflicts? one last time I promise.

i don't need anything that is outside src/ so you can leave them out.

@chris-kruining
Copy link
Author

@chris-kruining the branch is ready. could you rebase and resolve conflicts? one last time I promise.

i don't need anything that is outside src/ so you can leave them out.

My client wouldn't allow me to rebase on /src alone, so you might wanna cherry pick again, So I hope I did this right

@thesayyn
Copy link
Owner

it's worse now tbh. there are conflicts remaining in the files.

@chris-kruining
Copy link
Author

dammit, I'll just reset the branch and manually re-add the files

@chris-kruining
Copy link
Author

wait?! why did it close? because I reset all the changes?

@thesayyn
Copy link
Owner

probably. no worries. just send another one against typescript branch.

@chris-kruining
Copy link
Author

ok, should be fine now.

@thesayyn
Copy link
Owner

Perfect!

@thesayyn thesayyn merged commit ea30644 into thesayyn:typescript Jan 21, 2022
@chris-kruining chris-kruining deleted the typescript-1 branch January 21, 2022 20:53
@chris-kruining
Copy link
Author

what an adventure with git today 🤣

@chris-kruining chris-kruining changed the title Typescript chanches Typescript changes Jan 21, 2022
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.

2 participants