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 }}
gitking
/
JavaDemoStudyProject
Public
Notifications
You must be signed in to change notification settings
Fork
0
Star
0
Code
Issues
0
Pull requests
0
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security and quality
Insights
Commits
Breadcrumbs
History for
JavaDemoStudyProject
README.md
on
master
User selector
All users
Datepicker
All time
Commit history
Commits on Sep 3, 2019
我在master上面修改了一个BUG提交了
gitking
committed
48125c1
View commit details
Copy full SHA for 48125c1
View code at this point
Browse repository at this point
合并失败了,我用commit提交了
gitking
committed
b1b7993
View commit details
Copy full SHA for b1b7993
View code at this point
Browse repository at this point
我现在在Dev分支上面开发,尝试使用--on-ff方式的merge合并版本
gitking
committed
75837d3
View commit details
Copy full SHA for 75837d3
View code at this point
Browse repository at this point
git解决冲突要靠自己修改文件,还不如SVN的图像界面,SVN图形界面可以对比着解决冲突
gitking
committed
16c4803
View commit details
Copy full SHA for 16c4803
View code at this point
Browse repository at this point
我在master上面也修改了readme.md
gitking
committed
663744d
View commit details
Copy full SHA for 663744d
View code at this point
Browse repository at this point
git怎么解决合并时发生的冲突
gitking
committed
af2c1f7
View commit details
Copy full SHA for af2c1f7
View code at this point
Browse repository at this point
我创建了一个新的分支dev
gitking
committed
2207596
View commit details
Copy full SHA for 2207596
View code at this point
Browse repository at this point
Commits on Aug 20, 2017
Initial commit
gitking
committed
4c8b1a7
View commit details
Copy full SHA for 4c8b1a7
View code at this point
Browse repository at this point
Loading
You can’t perform that action at this time.