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

Resolve aliases when scanning directories Fixes #1507 #1516

Merged
merged 1 commit into from Jul 17, 2013
Merged

Resolve aliases when scanning directories Fixes #1507 #1516

merged 1 commit into from Jul 17, 2013

Conversation

pjrobertson
Copy link
Member

@pjrobertson pjrobertson commented Jun 15, 2013

The bug was basically just a typo.

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jun 15, 2013

P.S. no idea where that 1st commit came from, but it's just a refactor. Nothing new

@skurfer
Copy link
Member

@skurfer skurfer commented Jul 15, 2013

Merge conflict from the first commit. If you want, I can manually remove it and just merge this branch with the second commit to fix the issue. This pull would have to be closed manually, and you'd have to stick the refactoring commit somewhere else.

@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jul 16, 2013

Go ahead and erge the 2nd commit. I can push the 1st straight to master.

skurfer added a commit that referenced this issue Jul 17, 2013
Resolve aliases when scanning directories Fixes #1507
@skurfer skurfer merged commit 7297569 into master Jul 17, 2013
@skurfer
Copy link
Member

@skurfer skurfer commented Jul 17, 2013

Force pushed this branch so it wouldn't include the other commit. Merged.

@pjrobertson pjrobertson deleted the i1507 branch Jul 19, 2013
@pjrobertson pjrobertson restored the i1507 branch Jul 19, 2013
@pjrobertson pjrobertson deleted the i1507 branch Jul 19, 2013
@pjrobertson
Copy link
Member Author

@pjrobertson pjrobertson commented Jul 19, 2013

OK, cheers

I've pushed the cleanup commit straight to master

On 17 Gorff 2013, at 23:31, Rob McBroom notifications@github.com wrote:

Force pushed this branch so it wouldn't include the other commit. Merged.


Reply to this email directly or view it on GitHub.

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.

None yet

2 participants