With git reflog check which commit is one prior the merge (git reflog will be a better option than git log). Then you can reset it using: There’s also another way: It will get you back 1 commit. Be aware that any modified and uncommitted/unstashed files will be reset to their unmodified state. To keep them either stash changes … Read more
git pull origin master pulls the master branch from the remote called origin into your current branch. It only affects your current branch, not your local master branch. It’ll give you history looking something like this: Your local master branch is irrelevant in this. git pull is essentially a combination of git fetch and git merge; it fetches the remote branch then … Read more
Really the ideal way to do this is to not use pull at all, but instead fetch and reset: (Altering master to whatever branch you want to be following.) pull is designed around merging changes together in some way, whereas reset is designed around simply making your local copy match a specific commit. You may want to consider slightly different options to clean depending on your system’s … Read more
git pull origin master will pull changes from the origin remote, master branch and merge them to the local checked-out branch. git pull origin/master will pull changes from the locally stored branch origin/master and merge that to the local checked-out branch. The origin/master branch is essentially a “cached copy” of what was last pulled from origin, which is why it’s called a remote branch in git … Read more
⚠ Important: If you have any local changes, they will be lost. With or without –hard option, any local commits that haven’t been pushed will be lost.[*] If you have any files that are not tracked by Git (e.g. uploaded user content), these files will not be affected. First, run a fetch to update all origin/<branch> refs to latest: Backup your … Read more
If you want to merge your branch to master on remote, follow the below steps: push your branch say ‘br-1’ to remote using git push origin br-1. switch to master branch on your local repository using git checkout master. update local master with remote master using git pull origin master. merge br-1 into local master using git merge br-1. … Read more
How I would do this If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what I want to push and also I wouldn’t push things at all, that are … Read more
This depends a lot on what you mean by “revert”. Temporarily switch to a different commit If you want to temporarily go back to it, fool around, then come back to where you are, all you have to do is check out the desired commit: Or if you want to make commits while you’re there, … Read more
Undo a commit & redo This command is responsible for the undo. It will undo your last commit while leaving your working tree (the state of your files on disk) untouched. You’ll need to add them again before you can commit them again). Make corrections to working tree files. git add anything that you want … Read more
git revert makes a new commit git revert simply creates a new commit that is the opposite of an existing commit. It leaves the files in the same state as if the commit that has been reverted never existed. For example, consider the following simple example: In this example the commit history has two commits … Read more