Working on server, that got a drive replaced with the .git folder being moved.
Now we have a new drive and a bunch of work down on various scripts and programs.
When we go to push the work to the git repository we get:
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/...'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first merge the remote changes (e.g.,
hint: 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
The work on the server is the most current and we want to keep it and make it master.
What is the easiest way to do this without losing the current scripts.