I am developing the views and models in my personal branch. After that I am trying to pull the code from production and merge it. But I am not able to merge it, it says : Someone else has made changes to this branch. 35 commits to be pulled or pull merge failed.
I tried to view project on bitbucket and then push the code to personal branch and merge to master. I have also tried creating a new branch. I am able to create new branch from git commands but not via Looker UI git actions. On Looker, it's showing access issues. I expect that I should be able to follow all the steps on UI like merge and pull or push to production etc and views and models created after that should be visible to everyone.
Solved! Go to Solution.
I checked with Looker support and they asked to reset the git connection for this issue.
Steps to follow are: https://cloud.google.com/looker/docs/best-practices/how-to-migrate-to-a-new-git-repo#simple_solution
The error message "Someone else has made changes to this branch" means that changes have made changes to the production branch since you last pulled from it which will cause a conflict when you try to merge your changes, because Git doesn't know which changes to prioritize.
There are a few ways to resolve this conflict:
*Fingers Crossed* Once you've resolved the conflict, you can merge your changes to the production branch. To do this, run the following command:
If the merge is successful, you should be able to see your changes in production.
Thanks Roderick for sharing this solution. But I am able to resolve conflicts from git commands but not via Looker UI and when I am trying to push to remote branch or master via my local command prompt, though it's getting pushed, but it's not visible on Looker UI.
And, I am not to push from Looker UI.
I checked with Looker support and they asked to reset the git connection for this issue.
Steps to follow are: https://cloud.google.com/looker/docs/best-practices/how-to-migrate-to-a-new-git-repo#simple_solution
Glad our friends in support were able to help out!