1
0
mirror of synced 2026-01-02 03:04:13 -05:00
Commit Graph

24 Commits

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