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.

Sign up for GitHub

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

Jump to bottom

Update dev dependencies #7

Merged
merged 1 commit into from
Mar 7, 2015
Merged

Update dev dependencies #7

merged 1 commit into from
Mar 7, 2015

Conversation

lo1tuma
Copy link
Owner

@lo1tuma lo1tuma commented Mar 5, 2015

No description provided.

@lo1tuma lo1tuma added the upgrade label Mar 5, 2015
@lxanders
Copy link
Collaborator

lxanders commented Mar 7, 2015

Looks good to me. I'll manually merge the changes as Github seems to be unable to do it automatically.

@lxanders lxanders merged commit c8ac564 into master Mar 7, 2015
@lxanders lxanders deleted the update-dev-dependencies branch March 7, 2015 17:37
@lo1tuma
Copy link
Owner Author

lo1tuma commented Mar 7, 2015

Manually merging is not the best idea, if you use pr-log. If you do that, you should also adjust the merge commit message to be in the format Merge pull request #<pull-request-id> from <branch-name>.

@lo1tuma
Copy link
Owner Author

lo1tuma commented Mar 7, 2015

I will fix this but I need to force push to master.

@lxanders
Copy link
Collaborator

lxanders commented Mar 7, 2015

Sorry for forgetting about the changelog here. Do the force push to master. Unfortunately I didn't come up with an idea how to avoid such things thinking about it.

lxanders pushed a commit that referenced this pull request Mar 7, 2015
@lo1tuma
Merge pull request #7 from lo1tuma/update-dev-dependencies
2ef2b8d 
Update dev dependencies
@lo1tuma lo1tuma restored the update-dev-dependencies branch March 7, 2015 20:23
@lo1tuma lo1tuma deleted the update-dev-dependencies branch March 7, 2015 21:12
@lo1tuma
Copy link
Owner Author

lo1tuma commented Mar 7, 2015

Done with the force push. But manually editing the merge commit messages caused an extra new line in the commit message body. pr-log crashes with this extra new line, see lo1tuma/pr-log#4.

@lxanders
Copy link
Collaborator

lxanders commented Mar 8, 2015

I merged lo1tuma/pr-log#4 - please release a new version for pr-log and update (or maybe I will do it 😄) the dependency here.

@lo1tuma
Copy link
Owner Author

lo1tuma commented Mar 8, 2015

Released pr-log 1.1.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
upgrade
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lo1tuma @lxanders