git 变基："Could not apply (hash)."我迷路了

Question

我被要求为拉取请求"rebase和squash (my) commits into a single commit?" https://github.com/samtools/htsjdk/pull/34#issuecomment-45226559

这是我第一次这样做，我想我只做错了事情。我现在迷路了。

最后一次尝试:

$ 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'.

应该做些什么来满足审稿人的需求?

update:当我尝试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

关于您的fasq分支中的rebase，这将是:

git checkout fastq
git rebase -i 67901f963470a1cd2f8477f736b6b2192343485c (last commmit before your change)
# select s for each commmit in order to squash them)

---

一旦你的提交被重置/压缩，你将不得不强制推送你的分支，因为历史记录是不同的。

git checkout fastq
git push -f

这将自动更新PR (Pull Request)