Discuss Scratch

#1Nov. 1, 2015 20:19:46
BookOwl
Scratcher
1000+ posts

GitHub help

Basically, I am trying to merge a pull request into a branch, but it can not be done automatically. What I really want to do is just delete everything in the branch and replace it with code from the pull request. How would I do that?

Yes, I am a GitHub n00b. :P
who needs signatures
#2Nov. 1, 2015 20:21:25
comp09
Scratcher
1000+ posts

GitHub help

BookOwl wrote:

Basically, I am trying to merge a pull request into a branch, but it can not be done automatically. What I really want to do is just delete everything in the branch and replace it with code from the pull request. How would I do that?

Yes, I am a GitHub n00b. :P
Rebase?

Visit the website of Andrew Sun!


#3Nov. 1, 2015 20:43:25
BookOwl
Scratcher
1000+ posts

GitHub help

comp09 wrote:

BookOwl wrote:

Basically, I am trying to merge a pull request into a branch, but it can not be done automatically. What I really want to do is just delete everything in the branch and replace it with code from the pull request. How would I do that?

Yes, I am a GitHub n00b. :P
Rebase?
who needs signatures
#4Nov. 1, 2015 22:11:06
Ethan_1
Scratcher
100+ posts

GitHub help

Yeah, it is kinda a mess.

There should be better tutorials on Github. I really only know committing and stuff like that.

Last edited by Ethan_1 (Nov. 1, 2015 22:11:39)

#5Nov. 2, 2015 20:16:03
robinp
Scratcher
100+ posts

GitHub help

http://xkcd.com/1597/

I would help if you give me access or the repo or if get on the irc channel.

Last edited by robinp (Nov. 2, 2015 20:27:25)

System Administrator | Portfolio | My Blog | Web Developer
#6Nov. 2, 2015 20:28:17
DigiTechs
Scratcher
500+ posts

GitHub help

Ethan_1 wrote:

Yeah, it is kinda a mess.

There should be better tutorials on Github. I really only know committing and stuff like that.

Resolving merge conflicts manually is pretty easy, to be honest. You just edit the files effected by the merge (it adds nice little messages showing you where the differences are) and ‘merge in’ the changes. When you're done, simply remove the ‘pointers’ it puts in and when you commit (iirc, maybe merge again) it'll mark the merge as done
I do, in fact, have my own site; it's here.
I'm also working on a thing called Fetch. Look at it here!
@thisandagain pls explain. @thisandagain pls explain. @thisandagain pls explain. @thisandagain pls explain. @thisandagain pls explain.

Powered by DjangoBB