Some info which will save you the hassle next time:
It told me I needed to merge files but I did not know how so I copied files from test website into laptop local directory and continued my work
When you push to bitbucket form your desktop, you should have done the following on your laptop:
git fetch origin
git checkout master
git merge origin/master
The fetch retrieves all the recent changes on the remote branches, the checkout places you in whatever local branch you want to merge into (master in this case), and the merge command says to merge whatever is in origin/master into your local branch master. This is a really basic workflow, and 2 ppl working on the same project would follow that.
Anyways, for a quick and dirty way to recover without preserving the history, I'd simply delete the .git
folder, then run git init
in the root folder, git remote add <alias> <url>
and git add .
+ git push alias master -f
. For a smarter way to recover, you would need to provide more info on your git's status and clean up your post a bit.