michaelmcandrew/civicrm-buildkit-docker

Personal diffculty with locating CiviCRM core after sucesfull build

Closed this issue · 3 comments

prondubuisi commented

Hello @michaelmcandrew I have successfully installed CiviCRM using this buildkit. Now I am confused as I don't know where the CiviCRM core folders are pulled in. I will appreciate any help with this please.
Civi SIte
VS code

michaelmcandrew commented

hi @prondubuisi - looks like you are nearly there. Try expanding that dmaster folder you have highlighted in the sidebar.
CiviCRM core files should be in build/dmaster/sites/all/modules/civicrm.

prondubuisi commented

Hello @michaelmcandrew this works. I am trying to pull the latest commits to CiviCRM core and I am getting this

`coolife@coolife:~/git-repos/civicrm-buildkit-docker/build/dmaster/sites/all/modules/civicrm$ git pull origin master
From https://github.com/civicrm/civicrm-core

  • branch master -> FETCH_HEAD
    Updating f20312c9f6..0dcf3c833a
    error: Your local changes to the following files would be overwritten by merge:
    CONTRIBUTORS.txt
    CRM/ACL/API.php
    CRM/ACL/BAO/ACL.php
    CRM/ACL/BAO/Cache.php
    CRM/ACL/BAO/EntityRole.php
    CRM/ACL/DAO/ACL.php
    CRM/ACL/DAO/Cache.php
    CRM/ACL/DAO/EntityRole.php
    CRM/ACL/Form/ACL.php
    CRM/ACL/Form/ACLBasic.php
    CRM/ACL/Form/EntityRole.php

Aborting
`

any idea how I can fix this and then pull latest commits

michaelmcandrew commented

@prondubuisi this doesn't sound like it is a civicrm-buildkit-docker specific question. More of a general buildkit / civicrm development question. Try asking for help here: https://chat.civicrm.org/civicrm/channels/dev or https://chat.civicrm.org/civicrm/channels/dev-newcomers