Having done a git rebase on my local repo, and then done a forced update on the remote repo, I needed to copy the remote repo to my live website. I achieved this, after reading this thread on Stack Exchange.
git fetch --all
git reset --hard origin/masterNow my history on the website matches the history on the remote master.
If you’ve made commits to a master branch and you then want to update your current branch to reflect those changes, use
git rebase master when in your feature branch.
See this article on rebase vs. merge for a fuller explanation
Sometimes you’ve started some work on your project, then realised you should have started a new branch.
Create a new stash, using
git stashSee Git Stash for more details
This resets the Head back to your last commit, and stores the changes made since then in a new stash. List the stashes you have using
git stash listSwitch to the new branch then use
git stash applyto apply the changes. If you have lots of stashes, you can use stash@{2} if you have more than one stash. Dont forget to
git stash dropafter you’ve copied the stash to the new branch.
Gave the following error:
insufficient permission for adding an object to repository database
Fixed after reading the this article on Stackoverflow
Ran
git config core.sharedRepository groupand then chowned all the contents of objects folder on the master remote repo. Re-pushed from my local machine.