Hello everyone,
with aMSN2 gaining more popularity, hence more people looking forward to contribute, we have an increasing number of incoming patches and people contributing. Since we're using git now, we have already a great system to track contribution, so if you want to help or send a patch, we are using from now on github's pull request system. If you're already familiar with it , just go ahead and start developing, you don't need to know anything more than our main branch address, which stays the same:
http://github.com/amsn/amsn2/tree/masterIf you're not, here comes a small tutorial for you.
1 - Go to the address above. You'll see a button, "fork". Hit it. This will fork our repository and create your own copy of it on your account. Now you have already your own aMSN2 repository where you will be able to develop.
2 - Write code, push changes to your forked repository, and so on... well, do your thing!
3 - Once you're satisfied, and you think your code is ready to be merged with the main branch, you have a nice button, "Pull Request". Hit it, it will send me a message notifying that you want to push some code to our repo.
4 - The patch will be reviewed and applied to trunk. Obviously, all commit history & authors will be kept intact.
See how easy it is? The last missing bit is to keep your forked repo up-to-date with the master branch. It is pretty easy, here comes the steps you need to do:
1 - Add a new branch to your local repository. To do so, browse in a terminal to your local copy and hit those commands:
$ git remote add -f amsn git://github.com/amsn/amsn2.git
$ git checkout -b amsn/master
You need to do this only once.
2 - Now, everytime you want to sync your local copy, just do this:
$ git pull amsn master
And the main branch will be merged with your local copy. Easy, isn't it? You also probably want to push after this.
I hope you enjoyed this little tutorial, add questions/remarks/anything here below. I am looking forward to receive your pull requests!