git - merge conflict when local is deleted but file exists in remote

I am very new to git and wondered how I should go about a merge where in the local repo I have deleted several files on the master branch but these files exist within the remote master branch.

After doing git-merge it shows the conflicts that have occured.

Using git gui it shows that the local file is deleted, while the remote branch file has contents.

How do you stop these files from being conflicted? Is there a simple way using git gui?

Many thanks

Answers


You should resolve the conflicts as you see fit. If the file really is supposed to be removed, and you will be publishing that change to origin, remove it again:

git rm path/to/file

If the file should in fact be tracked still, add it (the version in the work tree will be the version from origin):

git add path/to/file

After doing either of those to resolve the conflict, commit the merge.


Need Your Help

Retrieving values from subviews Objective-c

iphone objective-c uiview subview

I have created a subclass of a UIView which is a rotating wheel. This wheel is part of another UIView which has an image in the top right corner.

A javascript that can display a different image, every minute of the day

javascript image clock

I am very new at JavaScript. I am trying to do a javascript on a php page that can display one different photo from a folder every minute of the day. The folder contains 1440 images and are named

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.