Moving source code to GitHub from SVN

Do you have a question or problem? Read this forum first! Someone has probably already asked the same thing in the past. Do not ASK questions here!

Moderators: Moderators, Documentation Writers

Are you excited?

Git ROCKS!
30
70%
SVN is the BEST!!!
7
16%
Meh
3
7%
About time...
3
7%
 
Total votes: 43

Message
Author
User avatar
itsrachelfish
Developers
Developers
Posts: 50
Joined: 27 Feb 2012, 12:50
Noob?: No

Re: Moving to GitHub

#21 Post by itsrachelfish »

By the way, hopefully you've seen our discussion about the new code review process: https://github.com/OpenKore/openkore/issues/9 :)
Tired of waiting for answers on the forums?
Want to talk to OpenKore experts?

Hang out on the #OpenKore IRC!

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#22 Post by sofax222 »

itsrachelfish wrote:
sofax222 wrote: Commit failed (details follow):
Access to '/OpenKore/openkore/!svn/act/a3b50695-c1dd-e647-b25c-05daf3acf7df'
forbidden


How can I be added into the members of Github/Openkore ??
Well, I'll need to know what your github account is. I tried "sofax222" and "sofax" but it wasn't either of those :(

Once we have your username, any of the project admins can add you as a developer to the project. But you don't even need to be an official developer to the project to contribute on GitHub. Anyone can make a fork of the project in their own account, make commits, and then submit a pull request to be approved in the official repo.

Edit: I've updated my original post to be more clear. Hope that helps /no1
My github account is "snop222" !!

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#23 Post by sofax222 »

itsrachelfish wrote:
sofax222 wrote: Commit failed (details follow):
Access to '/OpenKore/openkore/!svn/act/a3b50695-c1dd-e647-b25c-05daf3acf7df'
forbidden


How can I be added into the members of Github/Openkore ??
Well, I'll need to know what your github account is. I tried "sofax222" and "sofax" but it wasn't either of those :(

Once we have your username, any of the project admins can add you as a developer to the project. But you don't even need to be an official developer to the project to contribute on GitHub. Anyone can make a fork of the project in their own account, make commits, and then submit a pull request to be approved in the official repo.

Edit: I've updated my original post to be more clear. Hope that helps /no1
Ok !! Now I got a fork from the Openkore project.
After my own commit, and create a pull request to the official repo.
But Now !! How to re-checkout from the official project into my fork ?

User avatar
itsrachelfish
Developers
Developers
Posts: 50
Joined: 27 Feb 2012, 12:50
Noob?: No

Re: Moving to GitHub

#24 Post by itsrachelfish »

sofax222 wrote:Ok !! Now I got a fork from the Openkore project.
After my own commit, and create a pull request to the official repo.
But Now !! How to re-checkout from the official project into my fork ?
Hey there, I checked out your changes and everything looks good. Your pull request was merged into the main project. :)

Also, I've added you to the GitHub organization as a developer, check your email for confirmation.

Now that you have commit access, you can make your own branch in the main project repo and submit pull requests that way (instead of using a fork, if you prefer).

If you're still curious how someone would be able to checkout your forked code from the official project, they'd just have to make a local branch with your repo as the remote. This is explained on GitHub by follow these steps:

Image
Tired of waiting for answers on the forums?
Want to talk to OpenKore experts?

Hang out on the #OpenKore IRC!

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#25 Post by sofax222 »

itsrachelfish wrote:
sofax222 wrote:Ok !! Now I got a fork from the Openkore project.
After my own commit, and create a pull request to the official repo.
But Now !! How to re-checkout from the official project into my fork ?
Hey there, I checked out your changes and everything looks good. Your pull request was merged into the main project. :)

Also, I've added you to the GitHub organization as a developer, check your email for confirmation.

Now that you have commit access, you can make your own branch in the main project repo and submit pull requests that way (instead of using a fork, if you prefer).

If you're still curious how someone would be able to checkout your forked code from the official project, they'd just have to make a local branch with your repo as the remote. This is explained on GitHub by follow these steps:

Image
Yes !! I Got it !!
Thank you very much !!

So now, I can directly commit to the the official project, can't I ?
But now I have not codes need to commit.
I will keep this in my mind for next committing !!
I still don't well understand the GitHub user interface, I will do more effort on it.
Thanks again !!

One more question.....
Just like you said "... to checkout your forked code from ..."
In other words, I can keep my own version with this fork without merging from the official project.
Is it true ?

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#26 Post by sofax222 »

itsrachelfish wrote:
sofax222 wrote:Ok !! Now I got a fork from the Openkore project.
After my own commit, and create a pull request to the official repo.
But Now !! How to re-checkout from the official project into my fork ?
Hey there, I checked out your changes and everything looks good. Your pull request was merged into the main project. :)

Also, I've added you to the GitHub organization as a developer, check your email for confirmation.

Now that you have commit access, you can make your own branch in the main project repo and submit pull requests that way (instead of using a fork, if you prefer).
Some thing stranger ......
I found the revison number is different between my frok and the official repo !!
Is it normal ??

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#27 Post by sofax222 »

itsrachelfish wrote:Now that you have commit access, you can make your own branch in the main project repo and submit pull requests that way (instead of using a fork, if you prefer).

If you're still curious how someone would be able to checkout your forked code from the official project, they'd just have to make a local branch with your repo as the remote. This is explained on GitHub by follow these steps:

Image
Sorry, question again....
I work around on my fork of Openkore.....
But I can not find the "Merge pull request" function as your captured image, where is it ??

User avatar
itsrachelfish
Developers
Developers
Posts: 50
Joined: 27 Feb 2012, 12:50
Noob?: No

Re: Moving to GitHub

#28 Post by itsrachelfish »

sofax222 wrote:Sorry, question again....
I work around on my fork of Openkore.....
But I can not find the "Merge pull request" function as your captured image, where is it ??
You'll probably want to spend some time learning how git works, there are a lot of great resources out there including the official Git documentation and YouTube tutorials. I sent you that screenshot because it explains the steps required for someone to take the master openkore branch and apply your patch for testing.

Earlier today you merged two pull requests:

https://github.com/OpenKore/openkore/pull/34
https://github.com/OpenKore/openkore/pull/35

Did you test these changes in game before merging them? The point of making pull requests is so that developers can review and test changes before they are incorporated into the main project.
Tired of waiting for answers on the forums?
Want to talk to OpenKore experts?

Hang out on the #OpenKore IRC!

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#29 Post by sofax222 »

itsrachelfish wrote:Earlier today you merged two pull requests:

https://github.com/OpenKore/openkore/pull/34
https://github.com/OpenKore/openkore/pull/35

Did you test these changes in game before merging them? The point of making pull requests is so that developers can review and test changes before they are incorporated into the main project.
Ah, Sorry !! Very Sorry !! I think I had a mistake !!
I make wrong merging on main project !!
Could it to be rollbacked ??

I just want to try the "Merge Pull Request".
I will be more careful, before I well understnad the GitHub works !!
Sorry, again !!

PS: I think, I do only one "Merge", but merging two "Pull Request" !!

sofax222
Developers
Developers
Posts: 214
Joined: 24 Nov 2010, 03:08
Noob?: Yes

Re: Moving to GitHub

#30 Post by sofax222 »

itsrachelfish wrote:Did you test these changes in game before merging them? The point of making pull requests is so that developers can review and test changes before they are incorporated into the main project.
Dear itsrachelfish:

Now, am I a member of the Developers team in the OpenKore organization ??
Will the changes of main OpenKore repo automaticly to merge into my fork ??

Post Reply