Skip to content

'>' in section 3.2 is escaped to '>' #444

Closed

Description

@spacewander

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

  1. ben commented on Nov 3, 2015

    @ben
    Member

    Nope, this is an atlas bug. I've logged it here, hopefully it'll get resolved soon and I can just hit "rebuild."

  2. rybak commented on Nov 8, 2015

    @rybak

    Are > in section 7.2 part of this issue?

  3. wolfgang42 commented on Nov 16, 2015

    @wolfgang42

    I believe this is caused by the same issue as #371.

  4. jnavila commented on Nov 17, 2015

    @jnavila
    Member

    Close as duplicate

  5. anatolyborodin commented on Mar 17, 2016

    @anatolyborodin

    Hi @ben!

    I've logged it here, hopefully it'll get resolved soon and I can just hit "rebuild."

    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.

  6. anatolyborodin commented on Mar 17, 2016

    @anatolyborodin

    Effective March 2016, the Atlas forum is no longer available.

    LOL!

  7. YueLinHo commented on Mar 17, 2016

    @YueLinHo
    Contributor

    @anatolyborodin Since this is a duplicate to issue #371, better comment there. 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions