1
0
mirror of synced 2026-01-04 00:06:20 -05:00
Commit Graph

46 Commits

Author SHA1 Message Date
Hector Alfaro
08ca047c87 remove unnecessary conditionals from content files 2022-05-13 14:32:50 -04:00
per1234
a99482bcde Remove redundant mention of "Allow edits from maintainers" setting from intro
The very first sentence of the introductory paragraph of the "Creating a pull request from a fork" page is about a "Allow edits from maintainers" setting that will only be available after step 5 of the instructions.

This setting is already well explained at the appropriate place in the instructions. Mentioning it redundantly at the very start of the document is confusing and makes it less approachable to the target reader.
2022-04-15 17:56:24 -07:00
Sophie
fd3d6d3d37 Merge branch 'main' into sophie-6372 2022-04-14 09:44:12 +02:00
Sophie
848d23a34b Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md
Co-authored-by: hubwriter <hubwriter@github.com>
2022-04-14 09:40:51 +02:00
Sophie
4d619752d9 Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md
Co-authored-by: hubwriter <hubwriter@github.com>
2022-04-14 09:40:31 +02:00
Sophie
32aa3a5223 Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md
Co-authored-by: hubwriter <hubwriter@github.com>
2022-04-14 09:40:13 +02:00
Sophie
aa8a05af29 Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md
Co-authored-by: hubwriter <hubwriter@github.com>
2022-04-14 09:39:46 +02:00
Sophie
7f4d32f7a8 Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md
Co-authored-by: hubwriter <hubwriter@github.com>
2022-04-14 09:39:13 +02:00
Paul Loeb
53a53520ab add docs about deleting a branch with an open PR (#26880) 2022-04-13 15:11:53 +00:00
Sophie
b533809409 use topic branch instead of feauture branch 2022-04-06 11:56:28 +02:00
Sophie
adcfc6aa2b Tiny changes 2022-04-06 11:41:59 +02:00
Sophie
294574fbc9 Merge branch 'sophie-6372' of https://github.com/github/docs-internal into sophie-6372 2022-03-22 12:14:45 +01:00
Sophie
ee92830ec0 Changed order of content 2022-03-22 12:13:17 +01:00
Sophie
94b7d4081f Merge branch 'main' into sophie-6372 2022-03-22 12:03:36 +01:00
Sophie
8d89350a14 Adding content to page 2022-03-22 12:03:13 +01:00
Sophie
d4592095bb More detailed description of .. vs ... 2022-03-21 18:46:53 +01:00
Matt Pollard
f9fc043645 Merge branch 'main' into sophie-6156-content 2022-03-21 11:36:56 +01:00
Courtney Wilson
fd2d1036d5 refreshed some of the language around pull request reviews and differ… (#16127)
* refreshed some of the language around pull request reviews and different account types

* Apply suggestions from code review

Co-authored-by: hubwriter <hubwriter@github.com>

Co-authored-by: Felicity Chapman <felicitymay@github.com>
Co-authored-by: hubwriter <hubwriter@github.com>
2022-03-21 09:44:51 +00:00
Sophie
74ba23bec7 Change instances of user account to personal account in content 2022-03-16 15:18:37 +01:00
Robert Sese
79c48070c4 Deprecate 3.0 (#25646)
* Deprecate 3.0

* 3.0 deprecation: remove 3.0 markup (#25647)

* Remove liquid conditionals and content for 3.0 deprecation

* Remove manually, no longer versioned in a supported version

* Remove translations manually, no longer versioned in a supported version

* Remove 'if', now in all supported versions

* Remove dangling 'elseif', now in all supported versions

* Remove dangling 'elseif' and 3.0 screenshot reference, now in all supported versions

* Nudge to latest supported GHES version

* Nudge to latest supported release GHES version

* Bump all the version for the liquid tests

* Bump first deprecated version for linting tests

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Prefer double quotes

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Remove extra newline

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Remove extra newline

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Remove extra newline

Co-authored-by: Laura Coursen <lecoursen@github.com>

* One reusable per line

Co-authored-by: Laura Coursen <lecoursen@github.com>

* One reusable per line

Co-authored-by: Laura Coursen <lecoursen@github.com>

* One reusable per line

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Stray whitespace ✂️

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Version check not needed anymore

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Just 'ghes' since we're deprecating 3.0

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Don't depend on hardcoded versions

Co-authored-by: Laura Coursen <lecoursen@github.com>

* Remove static files for 3.0 deprecation (#25649)

Co-authored-by: Laura Coursen <lecoursen@github.com>
2022-03-03 13:08:24 -06:00
Tahlia G
e049c10711 Add product call out about multiple reviewers to "requesting a pull request review" page (#24421) 2022-02-21 09:19:58 +00:00
Vanessa
4b8b75e337 GitHub Enterprise Server 3.4 release candidate (#24754)
Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
Co-authored-by: Vanessa <vgrl@github.com>
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Lars Schneider <larsxschneider@github.com>
Co-authored-by: Jared Murrell <primetheus@github.com>
Co-authored-by: Jules Parker <19994093+jules-p@users.noreply.github.com>
Co-authored-by: Docubot <67483024+docubot@users.noreply.github.com>
Co-authored-by: Martin Lopes <martin389@github.com>
Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Sarita Iyer <saritai@github.com>
Co-authored-by: Sarita Iyer <66540150+saritai@users.noreply.github.com>
Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
Co-authored-by: hubwriter <hubwriter@github.com>
Co-authored-by: Steve Guntrip <stevecat@github.com>
Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Lars Schneider <larsxschneider@github.com>
Co-authored-by: Jared Murrell <primetheus@github.com>
Co-authored-by: github-openapi-bot <69533958+github-openapi-bot@users.noreply.github.com>
Co-authored-by: github-openapi-bot <github-openapi-bot@users.noreply.github.com>
2022-02-15 13:40:37 -05:00
Laura Coursen
06f56b70aa Reapply suggestion 2022-02-09 13:16:29 -06:00
Hindrik Bruinsma | DevOps Consultant
a041980059 Force pushing has its use
As you can keep the history clean and sane. Making merges easier.
2022-02-09 20:05:28 +01:00
Will Smythe
d7264cb4b6 Keeping your PR branch up to date article (#24795)
* Keeping your PR branch up to date page

* Apply suggestions from code review

Co-authored-by: Daniel Adams <dipree@github.com>

* Rename to match title

* Fix linting problems

* fix lint error

* Add update branch images

* Apply suggestions from @hubwriter

Co-authored-by: hubwriter <hubwriter@github.com>

* Update keeping-your-pull-request-in-sync-with-the-base-branch.md

* Apply suggestions from code review

Co-authored-by: hubwriter <hubwriter@github.com>

* Add article for managing repo-level setting and other tweaks

* Fix link in index

* Fix GHES version condition

* Wording tweaks to managing suggestions

* Update content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch.md

Fix typo

* Add a full stop.

* Update content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-suggestions-to-update-pull-request-branches.md

Add a full stop.

* Minor mod to the subheadings

* Add a little punctuation.

* Clarify rebase update instructions

Co-authored-by: Daniel Adams <dipree@github.com>
Co-authored-by: hubwriter <hubwriter@github.com>
2022-02-03 15:17:27 +00:00
Peter Bengtsson
be826a21cb remove all uses of include tool-switcher (part 2) (#24222) 2022-01-12 01:26:38 +00:00
Anil Seervi
2e9cf4d9ca Update keyboard shortcut to meet new style guidelines 2022-01-10 21:17:24 +05:30
Peter Bengtsson
97d8746422 cleaning up trailing slash redirects (part 9) (#23781) 2021-12-17 08:27:06 +00:00
Peter Bengtsson
0035e14e3b one fast link checker to rule them all (#23041)
* one fast link checker to rule them all

* -L alias

* refactor

* hacking away

* passing pages

* adding a workflow

* limit level to critical

* ability to pass a specific set of files

* testing specific files

* remove temporary debugging

* reorganize the printing

* formatting of output

* check images too

* prettyFullPath()

* minimal permission on workflow

* update comment

* new permission

* fix actions shas
2021-12-09 08:56:07 +00:00
Ethan Palm
f7497e17df Document implications of a force-push to a PR's head branch (#23023)
* Explain force push cautions

* add a sentence

* Explain necessity of force push

* More accurate noun
2021-11-20 00:10:13 +00:00
Robin Neatherway
8a1870700a [Nov 10 2021] Team notifications (#22252)
* Describe new "only notify requested members" changes

* Rename file

* Update links

* Update gated feature callout

* Restructure a bit

* Use feature flag

* Rearrange conditional

* Fix procedural versioning

* Restructure again

* Remove screenshot

* Fix versioning

* Split out version for recent other enhancements

* This will be shipped in GHES 3.4 not 3.5

* Close liquid tag

* Remove incorrect table row

Co-authored-by: Laura Coursen <lecoursen@github.com>
Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com>
Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>
2021-11-10 18:51:17 +00:00
hubwriter
85293f0135 Update master to main (#22718) 2021-11-10 16:38:26 +00:00
Jules Parker
3e72ad4dce Merge branch 'main' into jules-4795 2021-10-26 12:01:50 +02:00
Matt Pollard
5016286f81 Merge branch 'main' into jules-4795 2021-10-22 09:24:18 +02:00
Jules Parker
1aa0ee7ec1 add versioning to new articles 2021-10-18 15:48:05 +02:00
Jules Parker
13edfd8788 Merge branch 'main' into jules-4795 2021-10-18 15:11:48 +02:00
Jules Parker
41a9bdac07 fix broken links 2021-10-11 09:29:15 +02:00
Jules Parker
a6f487ae7c merging main into branch and resolving conflicts 2021-10-07 15:02:14 +02:00
Jules Parker
33673e06a0 update links and redirects for viewing and comparing commits 2021-10-07 12:40:50 +02:00
Jules Parker
202749a8fc update links and redirects for working with forks and creating and editing commits 2021-10-07 11:58:49 +02:00
Jules Parker
19c7c0ab74 update redirects and links for reviewing changes in prs 2021-10-07 11:09:32 +02:00
Jules Parker
1253d8edd9 update links and redirects for proposing changes to your work with prs 2021-10-07 07:33:00 +02:00
Jules Parker
c98f2eb4d0 update links and redirects for incorp. changes from pr 2021-10-06 16:15:23 +02:00
Jules Parker
39a5dfa0ed Update links and redirects for getting started 2021-10-06 15:40:17 +02:00
Jules Parker
2f7fb476af update redirects and links for collab on repos with code quality features 2021-10-06 15:35:57 +02:00
Jules Parker
78271efc74 directory deletions and creations with new index 2021-10-06 14:26:53 +02:00