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

GH-106318: resolving unrelated merge conflicts #1

Merged
merged 50 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5508700
[Doc] Added snippet code to str.join method
adorilson May 11, 2021
e388d45
[Doc] Added snippet code to str.ljust method
adorilson May 12, 2021
d8407ba
[Doc] Added snippet code to str.rjust method
adorilson May 12, 2021
08b88ef
[Doc] Added 'See also' in str.lstrip and str.rstrip methods from one …
adorilson May 12, 2021
52e3a6b
[Doc] Added snippet code to str.maketrans method
adorilson May 12, 2021
dee059c
[Doc] Added snippet code to str.translate method
adorilson May 12, 2021
1671497
[Doc] Added snippet code to str.partition method
adorilson May 12, 2021
c832623
[Doc] Added snippet code to str.replace method
adorilson May 12, 2021
0be8170
[Doc] Added snippet code to str.rfind method
adorilson May 12, 2021
ff65bd2
[Doc] Added snippet code to str.rindex method
adorilson May 12, 2021
322c88c
[Doc] Added snippet code to str.rpartition method
adorilson May 12, 2021
3a473df
[DOC] minor change
adorilson May 12, 2021
b653693
[Doc] Added snippet code to str.rsplit method
adorilson May 12, 2021
1b412cb
[Doc] Added snippet code to str.startswith method
adorilson May 12, 2021
fb56441
[Doc] Added snippet code to str.swapcase method
adorilson May 12, 2021
04a5212
[Doc] Added snippet code to str.upper method
adorilson May 13, 2021
8771775
[DOC] Added snipped code in str.capitalize
adorilson Feb 27, 2021
f2e224c
[DOC] Add snippet code in str.casefold and str.lower methods
adorilson Feb 27, 2021
1d39f92
[DOC] Added snippet code in str.center method
adorilson Feb 27, 2021
b3a70b6
[DOC] Added snippet code in str.count method
adorilson Feb 27, 2021
37477f8
[DOC] fix typo
adorilson Feb 28, 2021
f9a7293
[DOC] Added snippet code in str.encode method
adorilson Mar 13, 2021
2e54cb0
[DOC] Added snippet code to str.endswith method
adorilson Mar 13, 2021
96d9bf6
[DOC] Added snippet code with \n to str.expandtabs method
adorilson Mar 13, 2021
d1dc7e0
[DOC] Added snippet code to str.index method
adorilson Mar 14, 2021
8661d8e
[DOC] Added snippet code to str.isalnum method
adorilson Mar 14, 2021
9e1f289
[DOC] Added snippet code in str.isalpha method
adorilson Mar 15, 2021
9e361d8
[DOC] Added snippet code in str.isascii method
adorilson Mar 15, 2021
09a463a
[DOC] Added snippet code to str.isdecimal method
adorilson Mar 15, 2021
641de5c
[Doc] Added snippet code to str.isdigit method
adorilson Mar 22, 2021
eae1564
[Doc] Added snippet code to str.islower method
adorilson Mar 22, 2021
58331b8
[Doc] Added snippet code to str.isnumeric method
adorilson Mar 22, 2021
d7ce39c
[Doc] Added snippet code to str.isprintable method
adorilson Mar 22, 2021
b86cefd
[Doc] Added snippet code to str.isspace method
adorilson Mar 22, 2021
3df630c
[Doc] Adde snippet code to str.istitle method
adorilson Mar 22, 2021
ae42fea
Minor changes (formatting and typo)
adorilson Jun 11, 2023
4676daa
[Doc] Making lint happy
adorilson Jun 11, 2023
7642f31
Merge branch 'main' into str_methods_2
adorilson Jul 3, 2023
de11c93
Update Doc/library/stdtypes.rst
adorilson Jul 3, 2023
1695b93
[DOC] Added some 'see also' to str methods
adorilson Jul 3, 2023
ad6b56b
[DOC] Moved 'For example' to the end of the previous paragraph
adorilson Jul 3, 2023
e4e1405
[DOC] Putting a space after # in comments on str methods
adorilson Jul 3, 2023
2dfa3f2
[DOC] Fixed inconsistent literal block quoting
adorilson Jul 3, 2023
27cc327
fix other comments
hauntsaninja Jul 3, 2023
13c01d7
Merge branch 'main' into str_methods_2
adorilson Sep 17, 2023
03bef0a
prepare for FF
blaisep May 22, 2024
9c8955e
update the worflows files
blaisep May 22, 2024
e44d39c
prepare for FF
blaisep May 22, 2024
925c0be
Use the examples created by @adorilson
blaisep May 22, 2024
679eac8
Correct typos in rST formatting
blaisep May 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading