Force GIT Pull without commiting

I do a

git pull

and I get merge conflicts. I resolve the merge conflicts manually and issues a pull again but Git refuses to do it as Git is still thinking that there are merge conflicts.

Is there any way to force Git to perform a pull again and make it look for “diffs” (if any ) from the head(without committing the changes I made) ?

Answers


Why are you issuing a second git pull after fixing the merge conflicts from the first? That makes no sense. Once you fix the merge conflicts, you want to git commit instead, which will create the merge commit that merges the remote branch with your local one (and includes your conflict resolutions).


Need Your Help

how to select uniquely users that try to login more that 10 times on the internet

c# asp.net security c#-4.0

I currently developed a web site that my user must login to web site. When a user comes I create a Session for him/her and save number of time + time of unsuccessful logins for him.When user try 5 ...

Defining a variable through a subclass

java class variables inheritance

I'm using Java and I'd like an attribute of a class to be of any class derived from the class Service. I tried to write this:

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.