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

Ty-Pi / skills-resolve-merge-conflicts Public

generated from skills/resolve-merge-conflicts

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

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Security
Insights

Step 2, Resolve a merge conflict

Merge branch 'main' into my-resume #1

Sign in to view logs

Sign in to view logs

Merge branch 'main' into my-resume

Merge branch 'main' into my-resume #1

Summary
Jobs
- Check current step number
- On resolve merge conflict
Run details
- Usage
- Workflow file

Usage Workflow file

The logs for this run have expired and are no longer available.

Loading

Re-running jobs...

You can’t perform that action at this time.