The refs/pull/<number>/merge is a reference created by GitHub to keep track of what would happen if a pull request was merged. It references the merge commit between refs/pull/<number>/head and the destination branch (e.g. master). You can think of it as a “future” commit. GitHub (as well as other Git-based collaboration platforms) use this technique to … Read more
Check you remote: git remote -v Probably, your remote is https://server/../project and does not end with .git (https://server/../project.git).
The easiest solution I have found to this problem is: git add . git merge –abort
I had this issue, related to a branch. Following @fnagel’s similar approach, I just deleted the following folder, and it fixed the issue: .git/refs/remotes/origin/<name of branch>
Try: git clone git@bitbucket.org:project/project.git -b develop_one –single-branch For already cloned repos use: git fetch git checkout develop_one # Or more specific: git checkout –track -b develop_one This will track the develop_one branch from the remote.
this one did it for me docker-machine regenerate-certs –client-certs
It is only an issue if you have only published (pushed) some of your commits, because they would be harder to merge to other repos which have already those commits. Since their SHA1 have changed, Git would try to replay them again on those repos. If you have not (pushed any of those commits again), … Read more
Shell script that fast-forwards all branches that have their upstream branch set to the matching origin/ branch without doing any checkouts it doesn’t change your current branch at any time, no need to deal with working copy changes and time lost checking out it only does fast-forwards, branches that cannot be fast-forwarded will show an … Read more
This allowed me to tell git to ignore a specific file, even though it was already part of a project. All changes I make to it will be ignored: git update-index –assume-unchanged Localization/el-GR.js Notes It’s ignored by git status, but not by git pull. You can solve it with something like git remote update && … Read more
Dismiss review You can “Dismiss review” in the bottom section of the PR. expand approval(s) click three dots choose Dismiss review (not present in the timeline – little bit confusing) then it looks like (in the timeline)