• Login
  • Register
  • Dolphin Forums
  • Home
  • FAQ
  • Download
  • Wiki
  • Code


Dolphin, the GameCube and Wii emulator - Forums › Dolphin Emulator Discussion and Support › General Discussion v
« Previous 1 ... 148 149 150 151 152 ... 368 Next »

What is a merge pull request?
View New Posts | View Today's Posts

Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Thread Modes
What is a merge pull request?
02-26-2014, 12:56 PM
#1
Stevester118
Unregistered
 
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?
Reply
02-26-2014, 01:00 PM (This post was last modified: 02-26-2014, 01:01 PM by ExtremeDude2.)
#2
ExtremeDude2 Offline
Gotta post fast
*******
Posts: 9,310
Threads: 273
Joined: Dec 2010
The used a branch that someone else made and added it to the current code

That was my horribly simple attempt to explain
Check out my videos (dead)
[Image: sig-22354.png]
Website Find
Reply
02-27-2014, 08:40 AM
#3
pauldacheez Offline
hot take: fascism is bad
*******
Posts: 1,527
Threads: 1
Joined: Apr 2012
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").
<@skid_au> fishing resort is still broken: http://i.imgur.com/dvPiQKg.png
<@neobrain> dafuq
<+JMC47> no dude, you're just holding the postcard upside down
----------------------------------------
<@Lioncash> pauldachz in charge of shitposting :^)
Website Find
Reply
03-02-2014, 03:03 AM
#4
delroth Offline
Making the world a better place through reverse engineered DSP firmwares
**********
Developers (Some Administrators and Super Moderators)
Posts: 1,354
Threads: 63
Joined: Aug 2011
https://dolphin-emu.org/download/ is now more readable.
Pierre "delroth" Bourdon - @delroth_ - Blog

<@neobrain> that looks sophisticated enough to not be a totally dumb thing to do
Website Find
Reply
03-02-2014, 07:09 AM
#5
RachelB Offline
Developer
*******
Moderators
Posts: 1,003
Threads: 1
Joined: Dec 2011
Awesome, thank you for that.
Find
Reply
« Next Oldest | Next Newest »


  • View a Printable Version
  • Subscribe to this thread
Forum Jump:


Users browsing this thread: 1 Guest(s)



Powered By MyBB | Theme by Fragma

Linear Mode
Threaded Mode