search

vert-x / vertx-maven

Vert.x 2.x is deprecated - use instead
https://github.com/vert-x3/vertx-maven-starter
Other
22 stars 31 forks source link

Fixes for pullindeps, plugins, cleaned pom, no mods dir... #2

Closed sramki closed 11 years ago

sramki commented 11 years ago

I guess it will not be possible to do a direct merge. But just apply all stuff from the PR.

Thanks

-ramki

purplefox commented 11 years ago

Ramki - Looks like you didn't apply your changes against the latest version of vertx-maven so there are lots of conflicts and I can't merge this.

Can you please reapply your change?

sramki commented 11 years ago

Hi Tim,

I actually did apply all the changes you had. It showed a lot of conflicts and I just replaced my stuff with your changes. If you look at the second commit, it shows you all.

I guess its going to be hard to reapply all the changes and test everything. Will give it a shot. If its too difficult, can you just refork or apply the merge and resolve conflicts by updating the source with mine?

-ramki

purplefox commented 11 years ago

I'm not sure what you mean, but the conflict would need to be resolved before I can merge this in.

purplefox commented 11 years ago

Looking at your commits - to be frank, I'm not sure what you have done here - it looks like you have tried to manually applied my changes in your branch and then tried to submit a PR.. this doesn't make a lot of sense to me.

A better way to do this is to fork the vertx-maven project from the vert-x organistaion (i.e. NOT your branch), make your changes in there and submit a PR from that.

sramki commented 11 years ago

Yes, because of the conflicts, GIT could not merge automatically and I had to manually apply all your changes. Thats the reason.

I cannot fork yours as your repo was a fork of mine. It will just come back to my repo.

Do you mind reforking the repo? I mean, just delete your repo and just fork from my master again.

sramki commented 11 years ago

Tim,

Have done a proper merge now. Can you try and apply this Pull Request?

-ramki