1
0
mirror of synced 2025-12-22 03:16:52 -05:00
Commit Graph

56 Commits

Author SHA1 Message Date
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