What method shoud I use to merge in GitHub?

savaka

Should I use a pull request and then merge it?
Or should I use the “Update” feature of GitHub for Windows and then delete the old branch?
What are the advantages and disadvantages of these two options?

PullJosh

WooHooBoy

PullJosh wrote:

I've showed this about 5 times today to various people

MegaApuTurkUltra

PullJosh wrote:

fixed the broken image. It has to be https for chrome to allow it

Last edited by MegaApuTurkUltra (Nov. 1, 2015 02:22:52)

liam48D

MegaApuTurkUltra wrote:
PullJosh wrote:
fixed the broken image. It has to be https for chrome to allow it

nuuu it doesn't render for me

My browser / operating system: MacOS Macintosh X 10.11, Firefox 44.0

EDIT: wait now it does xD

Last edited by liam48D (Nov. 1, 2015 09:21:58)

PullJosh

Weird that it didn't work for a while.

I was using the edu redirect thing ‘cause I’m lazy.

savaka

PullJosh wrote:

It's xkcd

But does anyone actually have answers?

Last edited by savaka (Nov. 1, 2015 12:55:18)

Firedrake969

Depends. If it's merging from a feature/bug branch to the main, do a pull request. If it's from the main branch into a feature/bug branch (to keep things up-to-date), use git pull.
idk about the GUI though, because I prefer the CLI now.

savaka

Firedrake969 wrote:
Depends. If it's merging from a feature/bug branch to the main, do a pull request. If it's from the main branch into a feature/bug branch (to keep things up-to-date), use git pull.
idk about the GUI though, because I prefer the CLI now.

Ok

Discuss Scratch