Re: git pull fails with merge conflicts. How can this possibly happen?

[Sergey Organov]

Eli Zaretskii <address@hidden> writes:

[...]

> Second, too many things in Git are different, or are done differently,
> or have different effect from their namesakes in other VCSes
> (a.k.a. "have different semantics".  At times, I have a distinct
> feeling that Someone(TM) made a conscious effort to confuse me by
> picking up a different semantics.  Examples:

| sed -e 's/Git/Emacs/g' | sed -e 's/VCS/Editor/g'

and the result still holds. It's just that Git and Emacs have better
ways of doing things than anything else out there ;-)

-- 
Sergey.