Граф коммитов

233 Коммитов

Автор SHA1 Сообщение Дата
Sophie 36b13b9c69 changes more instances of codespaces 2022-06-03 11:41:32 +02:00
Sarita Iyer 3cfaaf31f1 fixes based on feedback 2022-06-01 17:25:46 -04:00
Sarita Iyer f2e5ce77bd Add info on alerts in Conversations tab 2022-05-31 17:23:09 -04:00
Sophie 374fbfd694 More fixes 2022-05-30 22:14:49 +02:00
Yang Cao 305b5f4bd5
Update checks getting started guide with retention information (#27965)
* Update checks getting started guide with retention information

* Clarifying edit to make the sentence more descriptive.

Co-authored-by: Konrad Pabjan <konradpabjan@github.com>

* Clarifying data may be deleted, also for status too

* Update wording and create reusable file

* Guard the section to only show in fpt and ghec

Co-authored-by: Konrad Pabjan <konradpabjan@github.com>
Co-authored-by: hubwriter <hubwriter@github.com>
2022-05-26 08:29:20 +00:00
Laura Coursen fe67b3d2aa
Add missing versioning (#27805) 2022-05-18 16:58:54 -05:00
Laura Thorson 7bd3ccbf72
Add default to PR title setting for squash merge documentation - part 2 (#27752) 2022-05-18 14:45:48 -05:00
Hector Alfaro c7bbfe4efa
Merge branch 'main' into hectorsector/redundant-version 2022-05-17 11:43:25 -04:00
Matt Pollard 52f7aaf271
GitHub AE May 2022 update (#27179) 2022-05-17 16:59:26 +02:00
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
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 b7257cebe0
Merge branch 'main' into saritai/dependency-review-api-and-action 2022-03-30 14:22:01 -04:00
Sarah Edwards ad4ce69f2f
update link (#26490)
Co-authored-by: Grace Park <gracepark@github.com>
2022-03-29 17:33:18 +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
Jules 9a085ab96c
Merge branch 'main' into jules-4796 2022-03-14 13:28:57 +01:00
Jules 3041e35d05
Update index.md 2022-03-14 13:17:31 +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
Vanessa 409b255443
Merge branch 'main' into patch-2 2022-03-03 08:15:05 +10:00
Vanessa f679a93cd3
Apply suggestions from code review 2022-03-03 08:02:01 +10: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
Sophie 9dff6e5157
Update content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md
Co-authored-by: Jules <19994093+jules-p@users.noreply.github.com>
2022-03-01 14:01:26 +01:00
Ritesh Patil bc542072fb fix: remove permission note and shift to permissions frontmatter 2022-03-01 10:13:29 +00:00
Sophie aa9ee8bd57 Removed reference to delete page 2022-02-28 21:50:07 +01:00
Sophie 46a5416f7d Deleted Commit branch and tag labels page 2022-02-28 21:50:07 +01:00
Sophie 547a12c4f3 Added a screenshot and a reusable 2022-02-28 21:50:07 +01:00
Sophie 9dc1088a5e Adding steps to procedural section 2022-02-28 21:50:07 +01:00
Sophie 675092a48a Added link to information on tagging 2022-02-28 21:50:07 +01:00
Sophie 9f2dda4346 Add screenshot and clarify steps 2022-02-28 21:50:07 +01:00
Sophie e91372b736 Adding screenshots 2022-02-28 21:50:07 +01:00
Sophie 59388cb193 Add About commit branches and tag labels 2022-02-28 21:50:07 +01:00
Jules Parker 32562ad193 Landing page for pull requests doc set 2022-02-28 14:01:21 +01: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
Tsuyoshi Miyake 6983ae5365
Add remote repository to git push commands 2022-02-16 23:11:34 +09: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
Rachael Sewell ef4dee2e7d
Revert "Revert "rest/reference/repos#statuses redirect"" (#24559) 2022-01-27 22:09:20 +00:00
Sarah Edwards 4d3cd8e605
Deprecate Helphub feedback form (#24590) 2022-01-25 16:41:38 +00:00
Rachael Sewell 91fbe1dd95
Revert "rest/reference/repos#statuses redirect (#24478)" (#24557) 2022-01-24 09:26:08 -08:00
Sarah Edwards 8228d02774
rest/reference/repos#statuses redirect (#24478) 2022-01-24 16:11:43 +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
Paul Loeb 4331e6db27
Update private forks doc to be more specific about permissions (#24064)
* update private fork permissions doc

* change wording slightly

* update push permissions docs

re https://github.com/github/repos/issues/12#issuecomment-992724381

* update wording slightly

Co-authored-by: Ethan Palm <56270045+ethanpalm@users.noreply.github.com>
2022-01-05 17:59:06 +00:00
Peter Bengtsson 97d8746422
cleaning up trailing slash redirects (part 9) (#23781) 2021-12-17 08:27:06 +00:00
Peter Bengtsson 1f5f65f94c
cleaning up trailing slash redirects (part 8) (#23741) 2021-12-16 09:08:17 +00:00
hubwriter 34c86a6355
Move update from ghes 3.3 to 3.4 (#23738) 2021-12-16 07:50:44 +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
Matt Pollard b3e1ff4e89
Update documentation for GitHub AE's December 2021 release (#23405) 2021-12-07 10:36:37 +01:00
Jules Parker 40fbb848f3
Merge branch 'main' into jules-4510 2021-12-01 09:11:00 +01:00
Ramya Parimi 33355c8643
Merge branch 'main' into patch-2 2021-11-29 08:26:32 -06:00
Jules Parker 1b65a1fb07 version based versioning 2021-11-25 11:46:27 +01:00
Mahdi Naderian b608494b93
Update content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks.md
Co-authored-by: Eric Cheng <ericcheng9316@gmail.com>
2021-11-25 09:29:15 +03:30
Eddie Lebow 5cd1e9d37a
Typo fix 2021-11-24 12:59:57 -05:00
Jules Parker 1de338c41b fix feature versioning syntax 2021-11-24 15:21:40 +01:00
Mahdi Naderian 9213a3b7e2
Update about-forks.md 2021-11-24 16:41:39 +03:30
Jules Parker f013c43d7c
Merge branch 'main' into jules-4510 2021-11-24 09:40:21 +01:00
Jules Parker 68b1bfb11e creates internal repo version and adds to articles 2021-11-24 08:22:56 +01:00
Jules Parker b3f4c16f4b more internal repo versioning 2021-11-23 14:46:58 +01: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
Perry Fraser db54aa084f fix: missing paren in link in "Resolving a merge conflict on GitHub" 2021-11-14 21:55:58 -05:00
Will Smythe d199571eac
Fix missing redirect to merge queue docs 2021-11-12 12:10:47 -05:00
Anil Seervi 21f08474b8
Add redirect for older version of article 2021-11-11 12:00:41 +05:30
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
Tanner baabf60642
Add the missing closing parenthesis for link 2021-11-08 12:56:46 -08:00
Tanner 5117bedc8e
Revert formatting as this pages link was good 2021-11-08 12:55:58 -08:00
Tanner 48b8461aee
Remove double quotes surrounding link so it renders correctly 2021-11-08 12:42:04 -08:00
hubwriter 31f46e7a0c
Mention the diff view & whitespace setting (#22253) 2021-11-03 09:28:26 +00:00
Rafael Maciel 3384cfb111 fix broken pull requests links 2021-11-02 17:41:41 -03:00
Jules Parker cbdda89482 adds merge queue doc 2021-11-02 11:39:46 +01:00
Jules Parker 2a08f64ad2 out of date branch Merge branch 'main' into jules-4795 2021-11-01 10:25:05 +01:00
Jules Parker 3e72ad4dce Merge branch 'main' into jules-4795 2021-10-26 12:01:50 +02:00
Jules Parker bb4c5077ac
Update content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts.md
Co-authored-by: Felicity Chapman <felicitymay@github.com>
2021-10-26 09:42:43 +02:00
Matt Pollard 5016286f81 Merge branch 'main' into jules-4795 2021-10-22 09:24:18 +02:00
Matt Pollard 4529b87c1d
Update introduction 2021-10-20 15:43:11 +02:00
Matt Pollard abb4a4dbd7 Adjust casing for short title 2021-10-19 13:47:21 +02:00
Matt Pollard 068b867aa1 Adjust casing and remove hyphen 2021-10-19 13:26:57 +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 d2bc8249b3 update links and redirects for toubleshooting commits 2021-10-07 12:23:13 +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 d84921d647 update redirects for addressing-merge-conflicts 2021-10-06 15:25:47 +02:00
Jules Parker 78271efc74 directory deletions and creations with new index 2021-10-06 14:26:53 +02:00