Stevester118
02-26-2014, 12:56 PM
Just a general question, ive been seeing it for the past week. About every update to the development version of dolphin has been a merge request, what does that mean?
02-26-2014, 12:56 PM
02-26-2014, 01:00 PM
The used a branch that someone else made and added it to the current code
That was my horribly simple attempt to explain
That was my horribly simple attempt to explain
02-27-2014, 08:40 AM
Lemme explain how the workflow goes now that Dolphin's on Github:
1. Someone makes a local branch, edits some code to do a specific thing (which can vary in scope from "remove a CMake option" to "use integers *everywhere* in the video backends"), commits those changes, and pushes their commits to a personal clone of Dolphin's repo on Github.
2. They think it's ready for others to review, so they make a pull request on Github.
3. delroth et. al. either nitpick the code and complain about things or just reply "LGTM" (looks good to me).
4. If sufficiently LGTM'd, it's merged into master. Otherwise, the pull-requester must change their changes until it's LGTM'd. The request can also be closed in case the devs don't want the code ("fuck you, we're not merging DX9 back in") or the pull-requester has second thoughts about having it merged in ("wait, no, this is a completely stupid approach towards fixing it").
1. Someone makes a local branch, edits some code to do a specific thing (which can vary in scope from "remove a CMake option" to "use integers *everywhere* in the video backends"), commits those changes, and pushes their commits to a personal clone of Dolphin's repo on Github.
2. They think it's ready for others to review, so they make a pull request on Github.
3. delroth et. al. either nitpick the code and complain about things or just reply "LGTM" (looks good to me).
4. If sufficiently LGTM'd, it's merged into master. Otherwise, the pull-requester must change their changes until it's LGTM'd. The request can also be closed in case the devs don't want the code ("fuck you, we're not merging DX9 back in") or the pull-requester has second thoughts about having it merged in ("wait, no, this is a completely stupid approach towards fixing it").
03-02-2014, 03:03 AM
https://dolphin-emu.org/download/ is now more readable.
03-02-2014, 07:09 AM
Awesome, thank you for that.