Skip to content

Navigation Menu

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

web-full-stack / git Public

Notifications
Fork 0
Star 2

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Files

.vscode
000-xyz
git workflow
git-hooks
src
test
.editorconfig
.gitattributes
.gitignore
LICENSE
README.md
git-fast-forward-merge.md
git-merge-conflict.md
git-no-fast-forward-merge.md

Breadcrumbs

git

/

git-merge-conflict.md

Copy path

Latest commit

fix: merge conflict

Oct 27, 2022

dd6ebc7 · Oct 27, 2022

History

3 lines (2 loc) · 44 Bytes

Breadcrumbs

git

/

git-merge-conflict.md

File metadata and controls

3 lines (2 loc) · 44 Bytes

git merge

merge conflicts / 合并冲突

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.