4 captures
10 Jul 2022 - 03 Oct 2024
Sep
OCT
Nov
02
2023
2024
2025
success
fail
About this capture
COLLECTED BY
Collection:
Save Page Now Outlinks
TIMESTAMPS
The Wayback Machine - https://web.archive.org/web/20241002181108/https://github.com/skills/resolve-merge-conflicts/actions
Skip to content
Navigation Menu
Toggle navigation
Sign in
Product
Actions
Automate any workflow
Security
Find and fix vulnerabilities
Codespaces
Instant dev environments
GitHub Copilot
Write better code with AI
Code review
Manage code changes
Issues
Plan and track work
Discussions
Collaborate outside of code
Explore
All features
Documentation
GitHub Skills
Blog
Solutions
By size
Enterprise
Teams
Startups
By industry
Healthcare
Financial services
Manufacturing
By use case
CI/CD & Automation
DevOps
DevSecOps
Resources
Topics
AI
DevOps
Security
Software Development
View all
Explore
Learning Pathways
White papers, Ebooks, Webinars
Customer Stories
Partners
Open Source
GitHub Sponsors
Fund open source developers
The ReadME Project
GitHub community articles
Repositories
Topics
Trending
Collections
Enterprise
Enterprise platform
AI-powered developer platform
Available add-ons
Advanced Security
Enterprise-grade security features
GitHub Copilot
Enterprise-grade AI features
Premium Support
Enterprise-grade 24/7 support
Pricing
Search or jump to...
Search code, repositories, users, issues, pull requests...
Search syntax tips
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Sign in
Sign up
Reseting focus
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 }}
skills
/
resolve-merge-conflicts
Public template
generated from
skills/template-template
Notifications
You must be signed in to change notification settings
Fork
101
Star
139
Code
Issues
1
Pull requests
0
Actions
Projects
0
Security
Insights
Additional navigation options
Code
Issues
Pull requests
Actions
Projects
Security
Insights
Actions: skills/resolve-merge-conflicts
Actions
All workflows
All workflows
Actions
Loading...
Loading
Sorry, something went wrong.
Showing runs from all workflows
13 workflow runs
13 workflow runs
Event
Filter by Event
Sorry, something went wrong.
Filter
Loading
Sorry, something went wrong.
No matching events.
Status
Filter by Status
Sorry, something went wrong.
Filter
Loading
Sorry, something went wrong.
No matching statuses.
Branch
Filter by Branch
Sorry, something went wrong.
Filter
Loading
Sorry, something went wrong.
No matching branches.
Actor
Filter by Actor
Sorry, something went wrong.
Filter
Loading
Sorry, something went wrong.
No matching users.
github_actions in /. - Update #893828378
Dependabot Updates
#4:
by
dependabot
bot
October 1, 2024 08:36
35s
October 1, 2024 08:36
35s
github_actions in /. - Update #893804942
Dependabot Updates
#3:
by
dependabot
bot
October 1, 2024 08:13
39s
October 1, 2024 08:13
39s
github_actions in /. - Update #877162798
Dependabot Updates
#2:
by
dependabot
bot
September 1, 2024 08:50
33s
September 1, 2024 08:50
33s
github_actions in /. - Update #863501509
Dependabot Updates
#1:
by
dependabot
bot
August 1, 2024 08:05
35s
August 1, 2024 08:05
35s
Change git user.name and user.email (#36)
Step 0, Welcome
#6:
Commit
edd3b7c
pushed by
heiskr
March 25, 2024 15:35
15s
main
main
March 25, 2024 15:35
15s
View workflow file
Change git user.name and user.email (#36)
Step 4, Merge your pull request
#10:
Commit
edd3b7c
pushed by
heiskr
March 25, 2024 15:35
16s
main
main
March 25, 2024 15:35
16s
View workflow file
Change git user.name and user.email
Step 1, Create a pull request
#18:
Pull request
#36
opened by
sinsukehlab
February 29, 2024 05:17
4m 26s
sinsukehlab:change-git-config
sinsukehlab:change-git-config
February 29, 2024 05:17
4m 26s
View #36
View workflow file
Bump actions/checkout from 3 to 4 (#30)
Step 0, Welcome
#5:
Commit
1604ec1
pushed by
heiskr
October 3, 2023 19:09
14s
main
main
October 3, 2023 19:09
14s
View workflow file
Bump actions/checkout from 3 to 4 (#30)
Step 4, Merge your pull request
#9:
Commit
1604ec1
pushed by
heiskr
October 3, 2023 19:09
15s
main
main
October 3, 2023 19:09
15s
View workflow file
Bump actions/checkout from 3 to 4
Step 1, Create a pull request
#14:
Pull request
#30
opened by
dependabot
bot
October 1, 2023 08:32
14s
dependabot/github_actions/actions/checkout-4
dependabot/github_actions/actions/checkout-4
October 1, 2023 08:32
14s
View #30
View workflow file
Update discussion link (#27)
Step 0, Welcome
#4:
Commit
6ce9717
pushed by
cmwilson21
August 28, 2023 15:13
14s
main
main
August 28, 2023 15:13
14s
View workflow file
Update discussion link (#27)
Step 4, Merge your pull request
#8:
Commit
6ce9717
pushed by
cmwilson21
August 28, 2023 15:13
14s
main
main
August 28, 2023 15:13
14s
View workflow file
Update discussion link
Step 1, Create a pull request
#13:
Pull request
#27
opened by
sinsukehlab
August 28, 2023 12:43
15s
sinsukehlab:discussion-category
sinsukehlab:discussion-category
August 28, 2023 12:43
15s
View #27
View workflow file
You can’t perform that action at this time.