Changes between Version 8 and Version 9 of drm4gDevelopment


Ignore:
Timestamp:
Dec 12, 2016 7:49:04 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • drm4gDevelopment

    v8 v9  
    155155}}}
    156156
     157----
    157158
    158159Another option would be to create a new branch from the "'''develop'''" branch and then try to make a pull request from that.
     
    167168}}}
    168169
     170The next time you enter your repository's web page, you'll see a new button:
     171
     172[[Image(pull_request_new_branch.png)]]
     173
     174Click on "'''''Compare & pull request'''''" to perform a pull request on to the main repository. The same will happen as when clicking on "New pull request" when on a previously existing branch.
    169175
    170176
     
    186192 * Bellow that, you can write an "optional extended description".
    187193  * When running `git log` from the command line, you'll just see both lines shown as the commit message.
     194 * When done just click on the "'''''Confirm merge'''''" button to finish.
    188195* If don't agree or there are conflicts, you can click right next to the "Merge pull request" button, where it says "'''''command line instructions'''''" to perform a manual merge.
    189196 * Just follow the instructions shown there.