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

Remove old lib directories when updating from 1.12 #167

Merged
merged 4 commits into from Dec 13, 2013
Merged

Remove old lib directories when updating from 1.12 #167

merged 4 commits into from Dec 13, 2013

Conversation

pebosi
Copy link
Contributor

@pebosi pebosi commented Dec 12, 2013

Remove old lib directories when updating from 1.12

pebosi and others added 3 commits December 12, 2013 16:14
Following error:
PHP Fatal error:  Class 'Piwik\\Tracker\\Common' not found in /var/www/piwik/core/Tracker/ActionClickUrl.php on line 43
@halfdan
Copy link
Member

halfdan commented Dec 12, 2013

Can you please rebase your PR and remove the two unneeded commits? We'd like to keep the commit history a bit more clean.

@pebosi
Copy link
Contributor Author

pebosi commented Dec 12, 2013

Removing the commits didnt work.

@halfdan
Copy link
Member

halfdan commented Dec 12, 2013

Well.. mostly because you're using the master branch. Please use a new branch when you work on a feature.

git rebase -i HEAD~3 will let you merge your previous commits. git push -f will force push the rebased commits.

mattab pushed a commit that referenced this pull request Dec 13, 2013
Remove old lib directories when updating from 1.12 -- thanks for fixing the namespace bug too!
@mattab mattab merged commit 00854ac into matomo-org:master Dec 13, 2013
@pebosi pebosi deleted the remove_libs branch December 13, 2013 08:02
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

3 participants