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

issue 105: remove invalid config element. #110

Merged
merged 1 commit into from
Jun 12, 2014

Conversation

benson-basis
Copy link
Contributor

Fix example by removing invalid element.

The example on the usage page had an invalid element: <packageName/>.

@buildhive
Copy link

NAR plugin for Maven » nar-maven-plugin #163 SUCCESS
This pull request looks good
(what's this?)

@dscho
Copy link
Member

dscho commented Jun 12, 2014

Hmm. When I run git grep '<packageName>', I get four hits, not just one. Should they not be addressed all at the same time?

Furthermore, I suspect that the <packageName> tag actually wants to be a narSystemPackage tag instead of being removed... Thoughts?

@benson-basis
Copy link
Contributor Author

My bad. Your guess seems reasonable, I'll do more editing this evening and
push another commit.

On Thu, Jun 12, 2014 at 10:36 AM, dscho notifications@github.com wrote:

Hmm. When I run git grep '', I get four hits, not just one.
Should they not be addressed all at the same time?

Furthermore, I suspect that the tag actually wants to be
a narSystemPackage tag instead of being removed... Thoughts?


Reply to this email directly or view it on GitHub
#110 (comment)
.

@bimargulies
Copy link

I think I covered it this time.

@ctrueden
Copy link
Contributor

@bimargulies @benson-basis Note that rather than reverting commits on a topic branch, you can just squash them away with git rebase -i. Delete the df2fd8e and a732ae6 lines in your text editor and they'll be stricken from the branch. Then you can git push --force to push just the good commit (the one formerly known as 4ff0241) back to the branch, and the PR will update accordingly.

@benson-basis
Copy link
Contributor Author

OK, it that's the preferred scheme here, I'll do it. Everyone seems to have
a different preference, is this project's written down?

On Thu, Jun 12, 2014 at 2:02 PM, Curtis Rueden notifications@github.com
wrote:

@bimargulies https://github.com/bimargulies @benson-basis
https://github.com/benson-basis Note that rather than reverting commits
on a topic branch, you can just squash them away with git rebase -i.
Delete the df2fd8e and a732ae6 lines in your text editor and they'll be
stricken from the branch. Then you can git push --force to push just
the good commit (4ff0241) back to the branch, and the PR will update
accordingly.


Reply to this email directly or view it on GitHub
#110 (comment)
.

ctrueden added a commit that referenced this pull request Jun 12, 2014
Update <packageName> to <narSystemPackage>

Fixes issue #105.
@ctrueden ctrueden merged commit 005df43 into maven-nar:master Jun 12, 2014
@ctrueden
Copy link
Contributor

Thanks @benson-basis!

@buildhive
Copy link

NAR plugin for Maven » nar-maven-plugin #172 SUCCESS
This pull request looks good
(what's this?)

@ctrueden
Copy link
Contributor

As for documenting the preferred process: unfortunately, we haven't documented specifics like "squashing preferred" etc.

@dscho
Copy link
Member

dscho commented Jun 12, 2014

OK, it that's the preferred scheme here, I'll do it. Everyone seems to have a different preference, is this project's written down?

If you want to be able to use Git effectively, including powerful commands such as git bisect, there is actually no alternative to rewriting topic branches rather than adding commit on commit only to fix up problems introduced by earlier changes in the same topic branch. Otherwise, you'll be in for a lot of pain when you try to bisect even the most trivial bugs.

@bimargulies
Copy link

You don't have to convince me, just tell me what you prefer.

On Thu, Jun 12, 2014 at 2:38 PM, dscho notifications@github.com wrote:

OK, it that's the preferred scheme here, I'll do it. Everyone seems to
have a different preference, is this project's written down?

If you want to be able to use Git effectively, including powerful commands
such as git bisect, there is actually no alternative to rewriting topic
branches rather than adding commit on commit only to fix up problems
introduced by earlier changes in the same topic branch. Otherwise, you'll
be in for a lot of pain when you try to bisect even the most trivial
bugs.


Reply to this email directly or view it on GitHub
#110 (comment)
.

@buildhive
Copy link

NAR plugin for Maven » nar-maven-plugin #174 SUCCESS
This pull request looks good
(what's this?)

@dscho dscho modified the milestone: Version 3.2.0 Sep 29, 2014
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.

5 participants