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.

Sign up

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

codebuddies / documentation Public

Notifications
Fork 5
Star 3

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Files

.gitbook
assets
code-contribution
- issue
- branch.md
- coding_style.md
- development_environment.md
- merge_conflict.md
- pull_request.md
- quick_steps.md
- recognition.md
- review.md
contribution
index
other
walkthroughs
welcome
.bookignore
.gitignore
README.md
SUMMARY.md
book.json
index.md

Breadcrumbs

documentation
code-contribution

/

merge_conflict.md

Copy path

Latest commit

lpatmo

and

GitBook: [master] 49 pages and 6 assets modified

Apr 17, 2019

5bc4fec · Apr 17, 2019

History

4 lines (2 loc) · 48 Bytes

Breadcrumbs

documentation
code-contribution

/

merge_conflict.md

File metadata and controls

4 lines (2 loc) · 48 Bytes

6/ Dealing with Merge Conflicts

Coming Soon

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.