Closed rmarpozo closed 11 years ago
Joe Littlejohn » embedmongo-maven-plugin #22 SUCCESS This pull request looks good (what's this?)
Thanks for adding this @rmarpozo, a great addition. Could you tidy up a couple of things before I merge please?
You have some white-space problems, could you make sure that all indents are four spaces, no tabs. This project indents with four spaces.
Also, could you remove 7619909 from this pull request? I prefer not to have this m2e specific cruft in the project.
Joe Littlejohn » embedmongo-maven-plugin #23 SUCCESS This pull request looks good (what's this?)
Hi,
I've fixed the tabs problem.
I'm quite new to Github and I'm not sure how to remove a file from the pull request. Any idea?
Excellent, thanks @rmarpozo.
To remove 7619909 from the pull request I would reset to the previous commit, then cherry-pick your 'tabs to spaces' commit to re-apply it.
So, try the following on your local repo:
git reset --hard 908ccbfd7a32c1a88d509e1a49f859bb2c8ee2e5
git cherry-pick 95dec854caed6059ded75f56fc2fd77d5bb3a6a4
git push -f origin master
You'll need to push with -f
because the cherry pick command rewrites/changes commits to make them appear as if they have been done in a different order.
I've merged using the strategy described above.
@rmarpozo because I cherry-pick'd 95dec854caed6059ded75f56fc2fd77d5bb3a6a4, the commit has been rebased and now has a different unique ref. This will make it somewhat difficult for you to merge this commit into your own fork. My suggestion is to throw away your fork and create a new one. Let me know if you have any problems.
Thanks again for your contribution!!
@rmarpozo I've just release 0.1.6 that will include this change. It should show up in maven central in the next 4 hours.
Great!!! Sorry I couldn't make the changes you asked for. I've been quite busy lately.
Thanks
El 19/02/2013, a las 21:41, Joe Littlejohn notifications@github.com escribió:
@rmarpozo I've just release 0.1.6 that will include this change. It should show up in maven central in the next 4 hours.
— Reply to this email directly or view it on GitHub.
I've made some changes to support user proxy and user password. I tried setting the jvm properties but it didn't work.
I've added an Authenticator and everything is working perfectly now.
I hope you find this useful