Why didn't you fork from vim-scripts/adt.vim?

[ooesili]

Hello, I would like to collaborate with you on this project but I have a few questions. I noticed that you were the only contributor on the vim-scripts/adt.vim repo, but you seem to have abandoned all those commits when you made this one. Is there a reason for that? To move on... we can make a patch to add the changes in this repo to the vim-scripts one, and then base all work on that, or I could just start from what you have here and just ignore the vim-scripts/adt.vim repo. Either way, I would like to know as soon as possible what you would like to do so that we can decide soon and start collaborating on this. Thanks in advance.

[reallychenchi]

Hi, I haven't abandoned it, and now I am using adt.vim for android developing everyday. And I also make a local improvement, such as make the script support Windows You can find it in www.vim.org, I publish it in www.vim.org first.

Yes there is a reason which make you think I have abandoned it, it is, I am not familay with Git and GitHub -_- It's ture, but I am try my best to get used to git and github.

I am very glad that you are interesting in it and want to collaborate with it. But I don't know how to "make a patch", now there is only on branch in adt.vim and it is master. Do you want to add code to mast, or add a new branch? I know what I want to do with adt.vim, but I don't know how to manager the version in git

[reallychenchi]

Hi, I haven't abandoned it, and now I am using adt.vim for android developing everyday. And I also make a local improvement, such as make the script support Windows You can find it in www.vim.org, I publish it in www.vim.org first.

Yes there is a reason which make you think I have abandoned it, it is, I am not familay with Git and GitHub -_- It's ture, but I am try my best to get used to git and github.

I am very glad that you are interesting in it and want to collaborate with it. But I don't know how to "make a patch", now there is only on branch in adt.vim and it is master. Do you want to add code to mast, or add a new branch? I know what I want to do with adt.vim, but I don't know how to manager the version in git

Say double OK!

At 2013-03-19 10:52:06,"Wesley Merkel" notifications@github.com wrote:

Hello, I would like to collaborate with you on this project but I have a few questions. I noticed that you were the only contributor on the vim-scripts/adt.vim repo, but you seem to have abandoned all those commits when you made this one. Is there a reason for that? To move on... we can make a patch to add the changes in this repo to the vim-scripts one, and then base all work on that, or I could just start from what you have here and just ignore the vim-scripts/adt.vim repo. Either way, I would like to know as soon as possible what you would like to do so that we can decide soon and start collaborating on this. Thanks in advance.

¡ª Reply to this email directly or view it on GitHub.

[ooesili]

I don't know if you know this, but vim-scripts has a repository with all of your changes to the script from www.vim.org. I forked vim-scripts/adt.vim and applied the work you did in this repository to it, now the adt.vim files are the same. If you want, I could give you ownership of my fork (you did make the script after all) and you can base your current work off of it or you could just fork mine and do the same. You'll get the same files and commits, but it might not be as clear to other people that you created it.

Also if you want to get better with git. the Git Pro book is an excellent resource.

[reallychenchi]

Thank you very much! It's a suprise for me. I didn't know it. Does the vim-scripts is syncroized with www.vim.org? That is to say, if I publish codes to vim-script project in git-hub, it will be also published to www.vim.org, is it? I create this project because I can not visit www.vim.org and can not publish code to www.vim.org. If it is true, this project is not needed at all, I can continue to publish code to www.vim.org by vim-script project. I live in China, you may know, the Great Fire Wall in China always does some stupid thing, such as, it stops visits to sf.net and so does www.vim.org ( vim.org is based on sf.net).

Now I am still not familar with Git hub and I will study it from the link by you, so please keep the ownership of your fork if you also want to add codes to adt.vim now, you are warmly welcome, surely. I will continue improve adt.vim, too. I plan make vim is as convinent for developing android projects as Ecplise+adt, that why it is named as adt.vim

[reallychenchi]

Thank you very much! It's a suprise for me. I didn't know it. Does the vim-scripts is syncroized with www.vim.org? That is to say, if I publish codes to vim-script project in git-hub, it will be also published to www.vim.org, is it? I create this project because I can not visit www.vim.org and can not publish code to www.vim.org. If it is true, this project is not needed at all, I can continue to publish code to www.vim.org by vim-script project. I live in China, you may know, the Great Fire Wall in China always does some stupid thing, such as, it stops visits to sf.net and so does www.vim.org ( vim.org is based on sf.net).

Now I am still not familar with Git hub and I will study it from the link by you, so please keep the ownership of your fork if you also want to add codes to adt.vim now, you are warmly welcome, surely. I will continue improve adt.vim, too. I plan make vim is as convinent for developing android projects as Ecplise+adt, that why it is named as adt.vim

Say double OK!

At 2013-03-20 01:59:17,"Wesley Merkel" notifications@github.com wrote:

I don't know if you know this, but vim-scripts has a repository with all of your changes to the script from www.vim.org. I forked vim-scripts/adt.vim and applied the work you did in this repository to it, now the adt.vim files are the same. If you want, I could give you ownership of this repository (you did make the script after all) and you can base your current work off of it or you could just fork mine and do the same. You'll get the same files and commits, but it might not be as clear to other people that you created it.

Also if you want to get better with git. the Git Pro book is an excellent resource.

¡ª Reply to this email directly or view it on GitHub.

[ooesili]

vim-scripts.org is a website that automatically generates GitHub at vim-scripts repos from www.vim.org, so that all the scripts are available as git repositories. Unfortunately, it does not synchronise the other way, so the only way to get your new versions onto www.vim.org is to publish them there. It seems that the only place you'll be able to release new versions is on your own GitHub repository.

I've created a branch called 'testing' on my repository where I'll put all of the changes I make to adt.vim, so you can look there if you want to see what I'm doing with it.

What I would like to do is to get us both working from the same commits so that it will be easier for you to merge in any of my changes that you like, and easier for me to pull from you as you continue to work on the script. The options we have for getting the commits in our repos to be the same are as follows:

1. You can fork a new repository from vim-scripts, add my fork as a remote and pull in a single commit from my master (super easy), then our repos will be the same, and will be in the same state as this one. This is probably the best option.
2. You can just fork my repository, my master branch is currently in the same state that yours is. The only problem with this is that it wont look like you created the project, it will like I did. and that you forked it.
3. You can just take ownership of my repository, it's just the vim-scripts repository with the 'linux + window' commit added. I can then just fork it again so that it looks like you started the project.

The thing to remember is that all of these options are very easy (I can walk you through the git commands) and your repo will then be in the same state as it is now, but you'll also have all of the changes from your releases on www.vim.org included. After that, it will be super easy for us to collaborate and merge in each other's changes.