• 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 ... 369 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-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
« Next Oldest | Next Newest »


Messages In This Thread
What is a merge pull request? - Stevester118 - 02-26-2014, 12:56 PM
RE: What is a merge pull request? - ExtremeDude2 - 02-26-2014, 01:00 PM
RE: What is a merge pull request? - pauldacheez - 02-27-2014, 08:40 AM
RE: What is a merge pull request? - delroth - 03-02-2014, 03:03 AM
RE: What is a merge pull request? - RachelB - 03-02-2014, 07:09 AM

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


Users browsing this thread: 2 Guest(s)



Powered By MyBB | Theme by Fragma

Linear Mode
Threaded Mode