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.

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

amhk / git-talk Public

Notifications You must be signed in to change notification settings
Fork 0
Star 0

Code
Issues
Pull requests
Actions
Projects
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Wiki
Security
Insights

Breadcrumbs

git-talk

/

git-merge-demo.tpp

Latest commit

History

14 lines (13 loc) · 252 Bytes

Breadcrumbs

git-talk

/

git-merge-demo.tpp

File metadata and controls

14 lines (13 loc) · 252 Bytes

1

2

3

4

5

6

7

8

9

10

11

12

13

14

titl git-merge(1) - demo

item Create a conflict

ite2

code git merge dev

ite2

code git status

item Resolve conflict by checking markers

item Fix conflicting file

ite2

code git add conflicting_file

item Finish the merge

ite2

code git commit

Footer

© 2024 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.