Geek Answers Handbook

Merge request request, close, then return - now you can’t pull the branch again

GitHub seems to be a bit lost after several operations - and I certainly ...

So here is the story:
I am new to git and new to github. In my repository I had a branch (call her B) where I worked on the function.

  • To make things transparent, I created a carry request.
  • My co-author (full git / github newbie) clicked to combine pull request (maybe just by looking at the interface).
  • The function was not ready, so I returned the merge.

Now I would like to continue working on branch B and merge it later, but although the branch differs by more than 800 lines, GitHub shows that there is only one line of difference (one commit).

Perhaps this is due to the fact that I tried to reopen the old retrieval request after the changes were returned. I reopened the pull request, but the merge option was no longer available. I tried to close or open the old pull request and create a new pull request (pull the branch Bto master), but this only shows one commit, as if all the others were eaten by the original pull request (although they returned). But if I try to pull masterin B- it will display all the differences (about + 800 / -300 differences).

B - , B ( , pull B master, ). ?

+4
3

, B, :

  • C,
  • B ( )
  • B, C

PR C.

+4

, , , :

, , . ( ). , git status, .

, , PR, , .

+1

, - , , PR. - :

git checkout master
git checkout -b retry_B  # create new branch
git log  # find commit hash for the revert
git revert <hash_from_revert>
+1

More articles:


All Articles