How to undo merge GIT with some conflicts, still not pushed?

Dung Do Tien Feb 08 2022 55

Hello Guys, I have a small project with .Net Core and I used Git to manage source code. I have two branches, they are beta and uat. 

Today I merged code from beta into uat branch. But I found some commits are not code done and I don't want to merge, I still do not push them.

You can see have 7 commits in the image below:

How to undo merge GIT with some conflicts, still not pushed?

And I want to undo merge git, I checked on Visual Studio 2019 but it does not have any button to help revert it.

How can I undo it?

Have 2 answer(s) found.
  • G

    Gerardo Valle Feb 08 2022

    Yeah, I undo merge git every day. You are merging code from beta to uat branch and you still not push it, you can use the command below:

    git reset --hard origin/uat

    It really worked for me.

  • s

    shruti sarva Feb 08 2022

    You can refer to some ways below:

    git reset --hard <commit_sha>

    There's also another way:

    git reset --hard HEAD~1

    You also can use the --merge switch instead of --hard since it doesn't reset files unnecessarily:

    git reset --merge ORIG_HEAD

    I hope it is useful for you.

Related Q&A May You Like

  1. GitHub remote: Support for password authentication was removed on August 13, 2021
  2. Error remote: Repository not found on GitHub when clone
  3. The SDK 'Microsoft.NET.Sdk.Web' specified could not be found
  4. Unable to prepare context: unable to evaluate symlinks in Dockerfile in Asp.net Core
  5. Connection refused 127.0.0.1:3306 in .Net Core and MySql
  6. The operation failed as details for project could not be loaded in Asp.net Core
  7. Cannot implicitly convert type 'bool' to 'System.Threading.Tasks.Task<bool>' in C# Asp.Net Core
  8. Assets file 'project.assets.json' not found in Asp.net Core
  9. Eror the DbContext of type cannot be pooled in Asp.Net Core
  10. Error field doesn't have a default value in FE Core & MySql
  11. Your startup project doesn't reference Microsoft.EntityFrameworkCore.Design
  12. How to set GIT Username and email global in local computer?
  13. Denied: access forbidden in gitlab cicd with .net 6
  14. Git error fatal: cannot do a partial commit during a merge
  15. What is difference between "git pull" and "git fetch" in Git?
Leave An Answer
* NOTE: You need Login before leave an answer

* Type maximum 2000 characters.

* All comments have to wait approved before display.

* Please polite comment and respect questions and answers of others.

Most Quizs Popular

Start Test

Javascript - Functions

Start Test

Asp.Net Core - Exam test 01

Start Test

Asp.Net Core - Exam test 02

Start Test

C# - Level Beginner

Popular Tips

This site uses cookies so that we can remember you and understand how you interact with our website. This allows us to improve and customize your browsing experience. See our Cookies Policy.
X Close