Skip to content

Navigation Menu

Appearance settings

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

rust-lang / rust Public

Notifications You must be signed in to change notification settings
Fork 13.4k
Star 104k

Code
Issues 5k+
Pull requests 744
Actions
Projects 9
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Improve error output when encountering git conflict markers#115413

Closed

atsuzaki wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

atsuzaki:conflict-markeratsuzaki/rust:conflict-markerCopy head branch name to clipboard

Conversation Commits2 (2)Checks Files changed

Commits

Commits on Aug 31, 2023

naming refactor: `diff_marker` to `conflict_marker`
atsuzaki
committed
update error messages & bless tests
atsuzaki
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.