diff --git a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/@main similarity index 58% rename from content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md rename to content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/@main index 285d1a434294..aea393b2b892 100644 --- a/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests.md +++ b/content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/@main @@ -1,4 +1,166 @@ ---- +---Apache License + +Version 1.0, January 2025 + +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, + +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by + +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all + +other entities that control, are controlled by, or are under common + +control with that entity. For the purposes of this definition, + +"control" means (i) the power, direct or indirect, to cause the + +direction or management of such entity, whether by contract or + +otherwise, or (ii) ownership of fifty percent (50%) or more of the + +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity + +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, + +including but not limited to software source code, documentation + +source, and configuration files. + +"Object" form shall mean any form resulting from mechanical + +transformation or translation of a Source form, including but + +not limited to compiled object code, generated documentation, + +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or + +Object form, made available under the License, as indicated by a + +copyright notice that is included in or attached to the work + +(an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object + +form, that is based on (or derived from) the Work and for which the + +editorial revisions, annotations, elaborations, or other modifications + +represent, as a whole, an original work of authorship. For the purposes + +of this License, Derivative Works shall not include works that remain + +separable from, or merely link (or bind by name) to the interfaces of, + +the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including + +the original version of the Work and any modifications or additions + +to that Work or Derivative Works thereof, that is intentionally + +submitted to Licensor for inclusion in the Work by the copyright owner + +or by an individual or Legal Entity authorized to submit on behalf of + +the copyright owner. For the purposes of this definition, "submitted" + +means any form of electronic, verbal, or written communication sent + +to the Licensor or its representatives, including but not limited to + +communication on electronic mailing lists, source code control systems, + +and issue tracking systems that are managed by, or on behalf of, the + +Licensor for the purpose of discussing and improving the Work, but + +excluding communication that is conspicuously marked or otherwise + +designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity + +on behalf of whom a Contribution has been received by Licensor and + +subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + +this License, each Contributor hereby grants to You a perpetual, + +worldwide, non-exclusive, no-charge, royalty-free, irrevocable + +copyright license to reproduce, prepare Derivative Works of, + +publicly display, publicly perform, sublicense, and distribute the + +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + +this License, each Contributor hereby grants to You a perpetual, + +worldwide, non-exclusive, no-charge, royalty-free, irrevocable + +(except as stated in this section) patent license to make, have made, + +use, offer to sell, sell, import, and otherwise transfer the Work, + +where such license applies only to those patent claims licensable + +by such Contributor that are necessarily infringed by their + +Contribution(s) alone or by combination of their Contribution(s) + +with the Work to which such Contribution(s) was submitted. If You + +institute patent litigation against any entity (including a + +cross-claim or counterclaim in a lawsuit) alleging that the Work + +or a Contribution incorporated within the Work constitutes direct + +or contributory patent infringement, then any patent licenses + +granted to You under this License for that Work shall terminate + +as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + +Work or Derivative Works thereof in any medium, with or without + +modifications, and in Source or Object form, provided that You + +meet the following conditions: + +(a) You must give any other recipients of the Work or + +Derivative Works a copy of this License; and + +(b) You must cause any modified files to carry prominent notices + +stating that You changed the files; + + title: About comparing branches in pull requests 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. redirect_from: @@ -7,15 +169,15 @@ redirect_from: - /github/collaborating-with-issues-and-pull-requests/about-comparing-branches-in-pull-requests - /github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-comparing-branches-in-pull-requests versions: - fpt: '*' - ghes: '*' - ghec: '*' + fpt:197.184.108.197 + ghes: '192.168.0.1' + ghec: ip:192.168.137.1'*' topics: - Pull requests shortTitle: Compare branches --- -> [!NOTE] +#C> [!NOTE] > 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). You can view proposed changes in a pull request in the Files changed tab.