-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
[7.4.0] Fix the documentation for bazel fetch --configure
#23666
Comments
Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.
cc: @bazelbuild/triage |
|
Something is wrong here, this commit shouldn't have touched third_party |
@iancha1992 Can you try to manually cherry-pick c04a561? |
@meteorcloudy @fmeum I am getting the merge conflicts in the same files as well when I cherry-pick that commit |
@iancha1992 Can you try to cherry pick 1ab2c82 and then c04a561? |
@meteorcloudy I am having a same issue because the two files changes from c04a561 are This is the draft PR that has the cherry-picked commit, 1ab2c82 (I did try and cherry-pick c04a561 on top of this on my local and that's where the issue is): #23723 |
@meteorcloudy |
@iancha1992 I see, then let's ignore the change in |
I'll send a PR -- a lot of doc updates were never cherry-picked to the 7.x branches. |
Forked from #23665
The text was updated successfully, but these errors were encountered: