1
0
mirror of synced 2026-01-05 21:04:17 -05:00
Commit Graph

99 Commits

Author SHA1 Message Date
Steve Guntrip
c4e49a0f09 Update redirect for "Merge PR with merge queue" 2022-04-14 10:58:22 +01: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
ac4c64b683 Merge branch 'main' into sophie-6156-content 2022-04-13 09:14:13 +02:00
Sarita Iyer
32542d3833 Merge branch 'main' into saritai/dependency-review-api-and-action 2022-04-06 11:14:17 -04:00
Matt Pollard
30f2b92798 Merge branch 'main' into sophie-6156-content 2022-04-06 13:53:40 +02: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
2d49f7cd98 Merge branch 'main' into sophie-6372 2022-04-05 14:46:20 +02:00
mc
9e13674292 Update Merge Queue docs as per UI change (#26653)
* update as per UI change
2022-04-05 08:07:02 +01:00
Ariel Deitcher
89d21ce018 update merge queue docs (#26396)
* update merge queue docs
2022-03-31 16:04:17 +00:00
Sarita Iyer
c08f4b155e fixed versioning 2022-03-23 17:08:17 -04:00
Sarita Iyer
0411ac8d68 added missing versioning 2022-03-23 17:03:55 -04:00
Sarita Iyer
20613aaf77 added Dependency graph page and info on action 2022-03-23 16:38:33 -04: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
18edb677c9 Merge branch 'main' into sophie-6156-content 2022-03-17 09:25:19 +01:00
Sophie
74ba23bec7 Change instances of user account to personal account in content 2022-03-16 15:18:37 +01:00
Sophie
b78787169a Update content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md
Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com>
2022-03-11 09:10:18 +01:00
Sophie
d4e84e24a5 Merge branch 'main' into sophie-4821 2022-03-09 22:48:14 +01:00
Sophie
31eadedb80 Added versioning to pull request page 2022-03-09 15:30:53 +01:00
mc
23eafce29d Merge branch 'main' into patch-2 2022-03-07 17:04:41 +00: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
Mahmoud Hanafy
0eeae0b799 Correct link for reviewing dependency changes in a pull request 2022-03-03 16:11:02 +01:00
Sarah Edwards
89f45939b6 Document PR file tree view 2022-03-03 13:43:47 +00:00
Ethan Palm
8b0f7edea7 Merge branch 'main' into patch-2 2022-03-01 13:47:39 -08:00
Ethan Palm
6e1476b882 Apply suggestions from code review 2022-03-01 13:46:41 -08:00
Ethan Palm
cf4ff59ac0 Merge branch 'main' into fix/#14959 2022-03-01 07:26:46 -08:00
Ritesh Patil
bc542072fb fix: remove permission note and shift to permissions frontmatter 2022-03-01 10:13:29 +00: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
Courtney Wilson
b2a06b65e7 updated to reference write permissions (#15487)
* updated to reference write permissions

* Update content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md

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

* Update content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/reverting-a-pull-request.md

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

Co-authored-by: hubwriter <hubwriter@github.com>
2022-02-17 14:38:51 +00:00
Jenni Christensen
3ffd17b1a0 Added versioning and note for auto-merge email (#25423)
- Added versioning and note for auto-merge email
- Fixed list numbering
- Fixed note syntax I broke when fixing the list
- Removed image and replaced GitHub text with variable
2022-02-16 21:10:18 +00:00
Marco Eidinger
05d150f154 Update syncing-a-fork.md
Updating title
2022-02-15 15:09:07 -08:00
Marco Eidinger
dece0c18f1 Add GitHub CLI explanation in syncing-a-fork.md 2022-02-15 12:03:10 -08: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
Ritesh Patil
d8b6f17ada fix: add a note clarifying the required permissions for syncing a fork 2022-02-14 16:37:47 +00:00
Ryosuke Nakayama
5de3634662 Update about-forks.md (#25209) 2022-02-10 08:58:38 +00: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