git rebase: "Could not apply (hash)." I'm lost

Question

I've been asked to "rebase and squash (my) commits into a single commit?" for a pull request https://github.com/samtools/htsjdk/pull/34#issuecomment-45226559

It's the first time I'm doing this and I think I only do wrong things. I'm currently lost.

Last time I tried something:

$ git branch
* fastq
$ git status
$ git merge-base fastq master 
67901f963470a1cd2f8477f736b6b2192343485c
$ git rebase --interactive 67901f963470a1cd2f8477f736b6b2192343485c

(... tried things, ... pulled, pushed, etc...)

$ git rebase --continue
error: Ref refs/heads/fastq is at a3aa885e4943279a7ece9e2eae85b1a80c41af32 but expected c5dc7c69108d1d72cf9eeb0144332075b06fea71
fatal: Cannot lock the ref 'refs/heads/fastq'.

what should be done to answer the reviewer's need ?

update: when i try to push

$ git push origin fastq
To https://github.com/lindenb/htsjdk.git
 ! [rejected]        fastq -> fastq (non-fast-forward)
error: failed to push some refs to 'https://github.com/lindenb/htsjdk.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

Answer 1

Regarding the rebase in your fasq branch, that would be:

git checkout fastq
git rebase -i 67901f963470a1cd2f8477f736b6b2192343485c (last commmit before your change)

# select s for each commmit in order to squash them)

---

You will have to force push your branch once your commit is rebase/squashed, since the history is different.

git checkout fastq
git push -f

That will update the PR (Pull Request) automatically.