Skip to content
Navigation Menu
Sign in
Appearance settings
Platform
AI CODE CREATION
GitHub Copilot
Write better code with AI
GitHub Copilot app
Direct agents from issue to merge
MCP Registry
Integrate external tools
DEVELOPER WORKFLOWS
Actions
Automate any workflow
Codespaces
Instant dev environments
Issues
Plan and track work
Code Review
Manage code changes
Code Quality
Enforce quality at merge
APPLICATION SECURITY
GitHub Advanced Security
Find and fix vulnerabilities
Code security
Secure your code as you build
Secret protection
Stop leaks before they start
EXPLORE
Why GitHub
Documentation
Blog
Changelog
Marketplace
View all features
Solutions
BY COMPANY SIZE
Enterprises
Small and medium teams
Startups
Nonprofits
BY USE CASE
App Modernization
DevSecOps
DevOps
CI/CD
View all use cases
BY INDUSTRY
Healthcare
Financial services
Manufacturing
Government
View all industries
View all solutions
Resources
EXPLORE BY TOPIC
AI
Software Development
DevOps
Security
View all topics
EXPLORE BY TYPE
Customer stories
Events & webinars
Ebooks & reports
Business insights
GitHub Skills
SUPPORT & SERVICES
Documentation
Customer support
Community forum
Trust center
Partners
View all resources
Open Source
COMMUNITY
GitHub Sponsors
Fund open source developers
PROGRAMS
Security Lab
Maintainer Community
Accelerator
GitHub Stars
Archive Program
REPOSITORIES
Topics
Trending
Collections
Enterprise
ENTERPRISE SOLUTIONS
Enterprise platform
AI-powered developer platform
AVAILABLE ADD-ONS
GitHub Advanced Security
Enterprise-grade security features
Copilot for Business
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search
/
Sign in
Sign up
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
{{ message }}
Uh oh!
There was an error while loading.
Please reload this page
.
githubtraining
/
conflict-practice
Public
Notifications
You must be signed in to change notification settings
Fork
169
Star
3
Code
Issues
0
Pull requests
1
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
Manual
- #5
#5
Open
kenichiro-kimura
wants to merge 9 commits into
githubtraining:manual
githubtraining/conflict-practice:manual
from
ghe-demo-ab-kkimura:manual
ghe-demo-ab-kkimura/conflict-practice:manual
Copy head branch name to clipboard
Conversation
Commits
9
(9)
Checks
Files changed
Open
Manual
#5
kenichiro-kimura
wants to merge 9 commits into
githubtraining:manual
githubtraining/conflict-practice:manual
from
ghe-demo-ab-kkimura:manual
ghe-demo-ab-kkimura/conflict-practice:manual
Copy head branch name to clipboard
Commits
Commits on Apr 3, 2017
write note about merge conflicts in readme
brianamarie
committed
945ca60
View commit details
Copy full SHA for 945ca60
Browse repository at this point
add info about practicing Git and GitHub to readme
brianamarie
committed
a1a0c9d
View commit details
Copy full SHA for a1a0c9d
Browse repository at this point
change title on manual simulation
brianamarie
committed
9c84271
View commit details
Copy full SHA for 9c84271
Browse repository at this point
change wording in mini_bored
brianamarie
committed
9320b58
View commit details
Copy full SHA for 9320b58
Browse repository at this point
expand hex colors of urls
brianamarie
committed
3f3aaf1
View commit details
Copy full SHA for 3f3aaf1
Browse repository at this point
commenting out url colors
brianamarie
committed
1095c8c
View commit details
Copy full SHA for 1095c8c
Browse repository at this point
Commits on Jul 23, 2024
Merge branch 'main' into readme-update
kenichiro-kimura
authored
aeb695e
View commit details
Copy full SHA for aeb695e
Browse repository at this point
Merge pull request #1 from ghe-demo-ab-kkimura/readme-update
Show description for 6c96df2
kenichiro-kimura
authored
6c96df2
View commit details
Copy full SHA for 6c96df2
Browse repository at this point
conflict fix
kenichiro-kimura
committed
06cb25a
View commit details
Copy full SHA for 06cb25a
Browse repository at this point
You can’t perform that action at this time.
