git: Conflict error message

Q1: what's the alternative to auto-merge ?
Q2: what other kinds of conflict are there?
Q3: what about conflicted binaries?

Crossroadsman / ServerAdmin

Misc notes to self re server admin (Server-specific. General terminal/CLI notes should go to Shell and Command Line

Apache License 2.0

0 stars 0 forks source link

Open Crossroadsman opened 6 years ago

Crossroadsman commented 6 years ago

See s2.7 of git.md

Auto-merging lib/hello.rb
CONFLICT (content): Merge conflict in lib/hello.rb
Automatic merge failed; fix conflicts and then commit the result.