Recognize merge conflicts

Fail pre-emptively on merge conflicts, because they happen very often in Xcode projects due their nature, and the resulting error would depend on the position of the conflict marks.
Damn, to do such things: that's not right. Seems to been really late. Will fix that. Thanks for pointing out @kylef.



> On 27.09.2014, at 12:11, Kyle Fuller <notifications@github.com> wrote:
> 
> In lib/xcodeproj/plist_helper.rb:
> 
> > @@ -55,6 +55,9 @@ def read(path)
> >          unless File.exist?(path)
> >            raise ArgumentError, "The file `#{path}` doesn't exists"
> >          end
> > +        if File.open(path).each_line.any? { |l| l.match(/^(<|=|>){7}/) }
> This is leaking the file descriptor, it's never closed.
> 
> —
> Reply to this email directly or view it on GitHub.