-
Notifications
You must be signed in to change notification settings - Fork 335
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
Respect proxy settings when streaming the download and extraction of the CodeQL bundle #2624
Changes from 12 commits
0dc76a9
8f2cb3a
78be2f1
9c48c8b
b4bc093
b706e37
182c5e7
a89fbc8
c901aee
3951a82
51e71f8
4c20d4f
c6454d5
9323695
88bcf64
9e8cd42
1e5b591
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Large diffs are not rendered by default.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this line added due to a bad merge?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I will have a look.
This was reported as a conflict in the GitHub UI, but when I did a
git mergelocally, it had no problem automatically resolving the conflict. Perhaps it did a weird thing because of my.gitconfig.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I cannot find precisely what went wrong here, as the merge log is past my terminal character limit. I remember it saying that it resolved it automatically using the
ortmethod, but it apparently went wrong there.This is now fixed in 9e8cd42.
Going forward I will be more careful validating these merges went right.