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.
Not really useful for development, but really useful on CI environments.To delete a branch once you are done with it Once you have finished working on a branch and merged it into the master, you can delete the remote branch, both remotely and locally.This will do the trick: Be sure to switch to the master branch: How to revert changes It will happen sometimes, you do a few changes, a few commits and a few pushes, and then you find that what you wrote is just crap. The first thing is to get the “commit ID” of the good one.From /tmp/test/server 06564e6..89b5dae master - origin/master Updating 06564e6..89b5dae Fast forward readme | 1 1 files changed, 1 insertions( ), 0 deletions(-) [email protected]:/tmp/test/local$ cat ./readme Some changes in server version /tmp/test/local$ /tmp/test/local$ git branch * master our_branch /tmp/test/local$ git merge our_branch Merge made by recursive. Part of each site’s update includes converting the Word Press core and all frequently used plugins to Git submodules.
remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done.