Temporarily switch working copy to a specific Git commit

How to switch to specific Git commit without losing all the commits made after it? I want that local files will be changed, but commits’ database will remain intact, only the current position pointer is set to currently selected commit. I want to change files’ state to specific commit, run project and, when finished, restore … Read more

GitHub pull request showing commits that are already in target branch

I’m trying to review a pull request on GitHub to a branch that isn’t master. The target branch was behind master and the pull request showed commits from master, so I merged master and pushed it to GitHub, but the commits and diff for them still appear in the pull request after refreshing. I’ve doubled … Read more

Git error on commit after merge – fatal: cannot do a partial commit during a merge

I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also). When I commit the resolved file with git commit file.php -m “message” I get the error: fatal: cannot do a partial commit during a merge. I had the same issue before and … Read more