Doc 12754 redux hakim test #358
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
osfameron
force-pushed
the
DOC-12754-redux-hakim-test
branch
from
a3de769 to
8d385c8
Compare
|
Note that even squashed the modules/search/pages/search-request-params.adoc file has changes, which is odd! |
[DOC-12754] Correct search-request-params.adoc [DOC-12754] Update HEAD.yml for previews [DOC-12754] Add version/status labels and tweak language [DOC-12754] Add additional version status labels for clarity [NO ISSUE] Straightening out lots of merge conflicts and inconsistencies in search-request-params [DOC-12752] Fix search-request-params pls
osfameron
force-pushed
the
DOC-12754-redux-hakim-test
branch
from
8d385c8 to
47646ac
Compare
What I ended up doing on my one other branch where rebasing made sense:
That fixed branch is here: #357 But thanks for doing this to try and show me another method! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@sarahlwelton OK, this was a rather simpler option than what I did yesterday:
git rebase -i, but I'm sure that Github Desktop can do this.Note that at this point, even though there is only one commit, which ends with the same state as release/8.0, Github shows a file change in modules/search/pages/search-request-params.adoc. That's because of the extra commit on release/8.0 confusing it.
git rebase origin/release/8.0