indielib.com

Great thanks!

I suggest you make a pull request in github, you already fixed an issue and we will be very happy to add it

Ah and about timer we may have bug there. I will think about it more carefully as now i dont know what to say.

Please tell me if I did it right. I never used git before

Also I'm sorry for posting this thread it here, I just noticed there was a bug/suggestion forum

Hi faybe,
I think it is ok, - sorry for the slow handling of the pull-request, - I think DarthMike is really busy at the moment ( havn't heard from him lately, - but he will surface again, - he allways do ). Usually he does the merging into the main branch (I have a branch that needs merging to, so be sure I will nag him about your pull-request).

Again, thank for the pull-request it is really great of you =)

Regards.
MFK

_________________
Cross-platform repository: https://github.com/DarthMike/indielib-crossplatform
Cross-platform roadmap: http://www.indielib.com/wiki/index.php? ... eloper_FAQ

Hi i was in a short trip during weekend, no work i will manage it on Monday. I had suggestion to have some unit test for it, if you feel like it. If not I will merge anyway.

Thanks!

If you use a GUI, I don't really know too much. I prefer sourcetree anyway.

Regarding your question, you need to pull changes from the upstream repository. Meaning, you have 3 repos in structure for github:

UPSTREAM (ORIGINAL INDIELIB)
|
|
ORIGIN (YOUR FORK)
|
|
YOUR LOCAL REPO

So If I want to pull your changes from merge request, instead of doing it automatically via github, I can do:
Merging via command line

Step 1: Check out a new branch to test the changes — run this from your project directory
git checkout -b faybe-master master
Step 2: Bring in faybe's changes and test
git pull git://github.com/faybe/indielib-crossplatform.git master
Step 3: Merge the changes and update the server
git checkout master
git merge faybe-master
git push origin master


You can configure upstream repository. Check this post http://gitready.com/intermediate/2009/0 ... anges.html
Does it make sense?

Thank you I think I understand. I created some private test repos to try it out. So basically I fork your repo. Pull it to to my my local repo. Then I do some work and push it to my fork. Now if you make an update I add an remote of your repo pull it and then try to merge it. If everything works fine I push it to my fork. Please correct me if I'm wrong

Yes you got it