See https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging For example: ``` <<<<<<< HEAD:index.html <div id="footer">contact : email.support@github.com</div> ======= <div id="footer"> please contact us at support@github.com </div> >>>>>>> iss53:index.html ``` The source is correct, maybe a rebuild can solve the problem?
Activity
ben commentedon Nov 3, 2015
Nope, this is an atlas bug. I've logged it here, hopefully it'll get resolved soon and I can just hit "rebuild."
rybak commentedon Nov 8, 2015
Are
>in section 7.2 part of this issue?wolfgang42 commentedon Nov 16, 2015
I believe this is caused by the same issue as #371.
jnavila commentedon Nov 17, 2015
Close as duplicate
anatolyborodin commentedon Mar 17, 2016
Hi @ben!
Is there a new version with the fix? https://git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery still has
Reflog: HEAD@{0} (Scott Chacon <schacon@gmail.com>)etc.anatolyborodin commentedon Mar 17, 2016
LOL!
YueLinHo commentedon Mar 17, 2016
@anatolyborodin Since this is a duplicate to issue #371, better comment there. 😄