Warning updating the currently checked out branch
, then submodules present in each package in develompent will be registered and updated on checkout and new ones on updates via the develop command.If you don’t want to initialize any submodule, set value to This sets the git clone history size (git clone –depth parameter).From /tmp/test/server * [new branch] master -/tmp/test/local$ git branch * master /tmp/test/local$ git branch our_branch /tmp/test/local$ git branch * master our_branch /tmp/test/local$ git checkout our_branch Switched to branch 'our_branch' /tmp/test/local$ git branch master * our_branch /tmp/test/local$ /tmp/test/local$ touch new_file_in_branch /tmp/test/local$ git add ./new_file_in_branch /tmp/test/local$ git commit -am "new file in branch" [our_branch ffd16bd] new file in branch 0 files changed, 0 insertions( ), 0 deletions(-) create mode 100644 new_file_in_branch /tmp/test/local$ ls new_file_in_branch readme /tmp/test/local$ git checkout master Switched to branch 'master' /tmp/test/local$ ls readme /tmp/test/local$ git checkout our_branch Switched to branch 'our_branch' /tmp/test/local$ We could see that file know exists in our branch but doesn’t exist in master branch At first we will change something on server – while we were doing something in branch server version could be changed!/tmp/test/local$ cd ../local2 /tmp/test/local2$ vim readme /tmp/test/local2$ git status # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: readme # no changes added to commit (use "git add" and/or "git commit -a") /tmp/test/local2$ git diff diff --git a/readme b/readme index e69de29..3f421ec 100644 --- a/readme b/readme @@ -0,0 1 @@ Some changes in server version /tmp/test/local2$ git commit -am"Some changes in server version" [master 205be70] Some changes in server version 1 files changed, 1 insertions( ), 0 deletions(-) /tmp/test/local2$ git push origin master Counting objects: 5, done. Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done.
In that case developers can add a URL rewrite which automatically changes the URL to a writable repository.Luckily, it’s nothing severe, and in my case, pretty straight forward to fix (once you know the solution), but because the error didn’t make any sense, I’ve decided to document it here.The main problem is that I’m unable to checkout the # git checkout master error: The following untracked working tree files would be overwritten by checkout: wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/wp-content/plugins/akismet/Aborting# git checkout master -f warning: unable to rmdir wp-content/plugins/akismet: Directory not empty Checking out files: 100% (1993/1993), done. Part of each site’s update includes converting the Word Press core and all frequently used plugins to Git submodules.