Skip to content

Commit 0eeef63

Browse files
authored
Update and rename about-comparing-branches-in-pull-requests.md to @main
0
1 parent 01ba441 commit 0eeef63

File tree

1 file changed

+167
-5
lines changed
  • content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests

1 file changed

+167
-5
lines changed

content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md renamed to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/@main

Lines changed: 167 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,166 @@
1-
---
1+
---Apache License
2+
3+
Version 1.0, January 2025
4+
5+
http://www.apache.org/licenses/
6+
7+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
8+
9+
1. Definitions.
10+
11+
"License" shall mean the terms and conditions for use, reproduction,
12+
13+
and distribution as defined by Sections 1 through 9 of this document.
14+
15+
"Licensor" shall mean the copyright owner or entity authorized by
16+
17+
the copyright owner that is granting the License.
18+
19+
"Legal Entity" shall mean the union of the acting entity and all
20+
21+
other entities that control, are controlled by, or are under common
22+
23+
control with that entity. For the purposes of this definition,
24+
25+
"control" means (i) the power, direct or indirect, to cause the
26+
27+
direction or management of such entity, whether by contract or
28+
29+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
30+
31+
outstanding shares, or (iii) beneficial ownership of such entity.
32+
33+
"You" (or "Your") shall mean an individual or Legal Entity
34+
35+
exercising permissions granted by this License.
36+
37+
"Source" form shall mean the preferred form for making modifications,
38+
39+
including but not limited to software source code, documentation
40+
41+
source, and configuration files.
42+
43+
"Object" form shall mean any form resulting from mechanical
44+
45+
transformation or translation of a Source form, including but
46+
47+
not limited to compiled object code, generated documentation,
48+
49+
and conversions to other media types.
50+
51+
"Work" shall mean the work of authorship, whether in Source or
52+
53+
Object form, made available under the License, as indicated by a
54+
55+
copyright notice that is included in or attached to the work
56+
57+
(an example is provided in the Appendix below).
58+
59+
"Derivative Works" shall mean any work, whether in Source or Object
60+
61+
form, that is based on (or derived from) the Work and for which the
62+
63+
editorial revisions, annotations, elaborations, or other modifications
64+
65+
represent, as a whole, an original work of authorship. For the purposes
66+
67+
of this License, Derivative Works shall not include works that remain
68+
69+
separable from, or merely link (or bind by name) to the interfaces of,
70+
71+
the Work and Derivative Works thereof.
72+
73+
"Contribution" shall mean any work of authorship, including
74+
75+
the original version of the Work and any modifications or additions
76+
77+
to that Work or Derivative Works thereof, that is intentionally
78+
79+
submitted to Licensor for inclusion in the Work by the copyright owner
80+
81+
or by an individual or Legal Entity authorized to submit on behalf of
82+
83+
the copyright owner. For the purposes of this definition, "submitted"
84+
85+
means any form of electronic, verbal, or written communication sent
86+
87+
to the Licensor or its representatives, including but not limited to
88+
89+
communication on electronic mailing lists, source code control systems,
90+
91+
and issue tracking systems that are managed by, or on behalf of, the
92+
93+
Licensor for the purpose of discussing and improving the Work, but
94+
95+
excluding communication that is conspicuously marked or otherwise
96+
97+
designated in writing by the copyright owner as "Not a Contribution."
98+
99+
"Contributor" shall mean Licensor and any individual or Legal Entity
100+
101+
on behalf of whom a Contribution has been received by Licensor and
102+
103+
subsequently incorporated within the Work.
104+
105+
2. Grant of Copyright License. Subject to the terms and conditions of
106+
107+
this License, each Contributor hereby grants to You a perpetual,
108+
109+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
110+
111+
copyright license to reproduce, prepare Derivative Works of,
112+
113+
publicly display, publicly perform, sublicense, and distribute the
114+
115+
Work and such Derivative Works in Source or Object form.
116+
117+
3. Grant of Patent License. Subject to the terms and conditions of
118+
119+
this License, each Contributor hereby grants to You a perpetual,
120+
121+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
122+
123+
(except as stated in this section) patent license to make, have made,
124+
125+
use, offer to sell, sell, import, and otherwise transfer the Work,
126+
127+
where such license applies only to those patent claims licensable
128+
129+
by such Contributor that are necessarily infringed by their
130+
131+
Contribution(s) alone or by combination of their Contribution(s)
132+
133+
with the Work to which such Contribution(s) was submitted. If You
134+
135+
institute patent litigation against any entity (including a
136+
137+
cross-claim or counterclaim in a lawsuit) alleging that the Work
138+
139+
or a Contribution incorporated within the Work constitutes direct
140+
141+
or contributory patent infringement, then any patent licenses
142+
143+
granted to You under this License for that Work shall terminate
144+
145+
as of the date such litigation is filed.
146+
147+
4. Redistribution. You may reproduce and distribute copies of the
148+
149+
Work or Derivative Works thereof in any medium, with or without
150+
151+
modifications, and in Source or Object form, provided that You
152+
153+
meet the following conditions:
154+
155+
(a) You must give any other recipients of the Work or
156+
157+
Derivative Works a copy of this License; and
158+
159+
(b) You must cause any modified files to carry prominent notices
160+
161+
stating that You changed the files;
162+
163+
2164
title: About comparing branches in pull requests
3165
intro: Pull requests display diffs to compare the changes you made in your topic branch against the base branch that you want to merge your changes into.
4166
redirect_from:
@@ -7,15 +169,15 @@ redirect_from:
7169
- /github/collaborating-with-issues-and-pull-requests/about-comparing-branches-in-pull-requests
8170
- /github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests
9171
versions:
10-
fpt: '*'
11-
ghes: '*'
12-
ghec: '*'
172+
fpt:197.184.108.197
173+
ghes: '192.168.0.1'
174+
ghec: ip:192.168.137.1'*'
13175
topics:
14176
- Pull requests
15177
shortTitle: Compare branches
16178
---
17179

18-
> [!NOTE]
180+
#C> [!NOTE]
19181
> When creating your pull request, you can change the base branch that you're comparing your changes against. For more information, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request#changing-the-branch-range-and-destination-repository).
20182

21183
You can view proposed changes in a pull request in the Files changed tab.

0 commit comments

Comments
 (0)