code/wrench-js
Archived
1
Fork 0
Code Issues 22 Pull requests 7 Projects Releases Packages Wiki Activity Actions

Merge artifacts in version 1.5.3 #63

New issue
Closed
opened 2013-10-15 15:42:44 -07:00 by cmisare · 4 comments
cmisare commented 2013-10-15 15:42:44 -07:00 (Migrated from github.com)
Copy link

The state of version 1.5.3 appears to have some merge conflicts committed into it:

99686fbdc2/lib/wrench.js (L358)

99686fbdc2/lib/wrench.js (L399)

The state of version 1.5.3 appears to have some merge conflicts committed into it: https://github.com/ryanmcgrath/wrench-js/blob/99686fbdc248031b8c494ec085cf6cf59c99530e/lib/wrench.js#L358 https://github.com/ryanmcgrath/wrench-js/blob/99686fbdc248031b8c494ec085cf6cf59c99530e/lib/wrench.js#L399
ryanmcgrath commented 2013-10-15 15:44:32 -07:00 (Migrated from github.com)
Copy link

Been awake for 3 days now, must've missed them. HOLD PLEASE.

Been awake for 3 days now, must've missed them. HOLD PLEASE.
cmisare commented 2013-10-15 15:45:37 -07:00 (Migrated from github.com)
Copy link

No rush or worries. Just wanted to make sure you were aware. The issue popped up in one of our builds and was just passing along the information.

No rush or worries. Just wanted to make sure you were aware. The issue popped up in one of our builds and was just passing along the information.
ryanmcgrath commented 2013-10-15 15:52:30 -07:00 (Migrated from github.com)
Copy link

I think this should be fine now. This build fixes some things and merges a couple pull requests - let me know if you experience issues.

I think this should be fine now. This build fixes some things and merges a couple pull requests - let me know if you experience issues.
cmisare commented 2013-10-15 15:59:34 -07:00 (Migrated from github.com)
Copy link

Will do, thank you for the exceptionally quick response and I hope you find some sleep soon.

Will do, thank you for the exceptionally quick response and I hope you find some sleep soon.
This repository is archived. You cannot comment on issues.
No Branch/Tag specified
Branches Tags
master
gh-pages
No results found.
Labels
Clear labels   
Bug

   
Enhancement

   
Feature Request
No labels
Bug
Enhancement
Feature Request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: code/wrench-js#63
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?