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

Jump to bottom

"Git Fetch/Pull" command in (master) branch often results in Codebase-Database version or other strange errors #7765

Closed
saleemkce opened this issue Apr 25, 2015 · 2 comments
Closed

"Git Fetch/Pull" command in (master) branch often results in Codebase-Database version or other strange errors #7765

saleemkce opened this issue Apr 25, 2015 · 2 comments
Labels
answered For when a question was asked and we referred to forum or answered it.

Comments

@saleemkce
Copy link
Contributor

Hi everybody,

I often find it strange to encounter this error over and over again. Yesterday, I made a fresh git clone from Piwik Repo. Then created a branch to fix a css issue.#7764 After that, I wanted to make sure to get updates from master (After switching to master branch) if any. So I ran,

"git fetch" followed by
"git pull upstream master"

Immediately, I find myself locked out of application. I got this error (as screenshot),

git_pull_error_occured

Sometimes, I am even getting this too,

piwik_pull_error

Now, what is the problem here and how to manage "git pull" and get updates properly without getting locked by new updates (I mean git pull / fetch commands)? I just only followed the developer documentation and this occurs often. Help needed sooner.
@mattab
Copy link
Member

mattab commented Apr 27, 2015

Hi there, See FAQ how to use piwik from git: http://piwik.org/faq/how-to-install/faq_18271/

@mattab mattab closed this as completed Apr 27, 2015
@mattab mattab added the answered For when a question was asked and we referred to forum or answered it. label Apr 27, 2015
@saleemkce
Copy link
Contributor Author

Hmm great. Then, how different are the instructions given in this page http://developer.piwik.org/guides/contributing-to-piwik-core? (I have been following this link since the beginning) Is it the right page to follow than the one you just provided?

Thanks.

(Edit)
Hi Matthew, after reviewing both pages carefully, I am quite sure both point to same guidelines. I don't see anything wrong here. Moreover, the link, I am following, is very elaborate and clear. It would be great if we add "Date posted" to all developer docs page so that we know for sure how new/old they are.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
answered For when a question was asked and we referred to forum or answered it.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@mattab @saleemkce