Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates to javacomplete #1

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

james-m-henderson
Copy link

I made some changes to help javacomplete work under cygwin.

I also converted the README to markdown.

I also merged in some changes from itszero and tlvince.

@Shougo
Copy link

Shougo commented Dec 10, 2013

I want to merge your commits in https://github.com/Shougo/javacomplete.
Can you send the pull request?

@james-m-henderson
Copy link
Author

I haven't worked on this for sometime and don't have it setup in my environment so I don't feel comfortable sending a pull request until I can be sure it will apply cleanly onto your codebase. You are free to add my project as a remote and then merge my changes into your local copy.

https://help.github.com/categories/18/articles

Basically:

add my repo as a remote

git remote add james-m-henderson https://github.com/james-m-henderson/javacomplete.git

merge all the stuff my repo has that your's doesn't

git pull james-m-henderson master

You will have to handle some merge conflicts.

Let me know if you have any problems.

James

@Shougo
Copy link

Shougo commented Dec 10, 2013

OK. I will try it. Thansk.

@Shougo
Copy link

Shougo commented Dec 10, 2013

I merged your repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants