GitFichas
Cards
Blog
About
Book
🇧🇷
#030 What is a conflict?
Command
Description
conflict
It happens when two or more changes are made to the same chunk of a file and git doesn’t know how to apply the most recent change
>>>
,
===
, and
<<<
Conflicts markers