skills / resolve-merge-conflicts Goto Github PK
View Code? Open in Web Editor NEWLearn why conflicts happen and how to resolve them.
License: MIT License
Learn why conflicts happen and how to resolve them.
License: MIT License
A clear and concise description of what the bug is, and what you expected to happen.
Please include screenshots.
Add any other context about the problem here.
Describe the bug
Right after using the template repository, GitHub Actions fail to create the pull request to start the lesson.
To Reproduce
Steps to reproduce the behavior:
Expected behavior
Right after creating the new repository, there is a GitHub Action that creates a pull request to simulate a merge conflict.
Make a pull request
Warning: 1 uncommitted change
pull request create failed: GraphQL: GitHub Actions is not permitted to create or approve pull requests (createPullRequest)
Error: Process completed with exit code 1.
Device information
Additional context
❤️
sir. I have a big bug in on your code didn't see anything. what a failure. hahahahaha.
A clear and concise description of what the problem is, and what you solution you want.
What changes this feature would introduce. Any risks these changes involve. Any alternative solutions or features you've considered.
Add any other context or screenshots about the feature request here.
I have fixed workflows lest Actions should run in this repository.
Originally posted by @sinsukehlab in skills/connect-the-dots#10 (comment)
Describe the bug
A clear and concise description of what the bug is.
To Reproduce
Steps to reproduce the behavior:
Expected behavior
A clear and concise description of what you expected to happen.
Screenshots
If applicable, add screenshots to help explain your problem.
Device information
Additional context
Add any other context about the problem here.
Describe the bug
A clear and concise description of what the bug is.
To Reproduce
Steps to reproduce the behavior:
Expected behavior
A clear and concise description of what you expected to happen.
Screenshots
If applicable, add screenshots to help explain your problem.
Device information
Additional context
Add any other context about the problem here.
While working thru each lesson, it seems that more and more assumptions need to be made by the user.
There is no mention of opening the "My Resume" branch, and submitting a Pull Request. If these steps are not done, then the user will never see the Conflict that needs to be resolved in Step 2, Activity 1
We now have a designated discussion area for each course! 🎉
This means all of our course links need to be updated to point to the correct discussion page.
There are two places in each course where discussions are referenced
These two files will have a link to https://github.com/orgs/skills/discussions
that will need to be replaced with the link for the course specific discussion. You can find those links here, in the left menu section. Copy the link to the discussion category for this course and replace it in those two files.
Be sure to link your PR to this issue for review.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.