holynakamoto / merge-conflict Goto Github PK
View Code? Open in Web Editor NEWHome Page: https://lab.github.com/githubtraining/managing-merge-conflicts
License: MIT License
Home Page: https://lab.github.com/githubtraining/managing-merge-conflicts
License: MIT License
Congratulations @holynakamoto, you've completed this course!
Before I say good-bye, here's a recap of all the tasks you've accomplished in your repository:
Here are some instructions you can use to keep working on your resumΓ©:
To modify the other sections of the resume, simply create a new branch and modify the files found in the _data
folder.
For example, to modify the "Projects" section, edit the _data/projects.yml
file. After making your changes, create a new pull request and merge your changes.
If you would like to change the image used on your resume, you need to make a few changes to the files.
new-avatar
.images
directory and click the Upload files button.new-avatar
branch, open the _layouts/resume.html
file and edit line 16. Replace images/bob-avatar.jpg
with images/YOURFILENAME
.When you are happy with your resume, you will need to publish it with GitHub Pages. This resume is ready for GitHub Pages, you just need to turn it on. Follow these steps to enable GitHub Pages when you are ready to officially publish your resume:
Your GitHub Pages resumΓ© site will be live very shortly. Click here to check it out.
Want to work on resolving merge conflicts using the command line? Check out this documentation.
Want to keep learning? Feel free to check out our other courses?
Hello, and welcome! If you're here to learn about and practice resolving merge conflicts, you're in the right place.
In this course, you'll learn why merge conflits happen by solving four merge conflicts. All of the merge conflicts in this course will be simple enough to solve from within the GitHub.com user interface, but if you'd prefer, you can solve them using the command line or other local tools.
As an added bonus, the project we are using for this course is a resume hosted on GitHub Pages! So, if you want to keep working after you complete this course, please feel free!
Note: You may notice that some branches and pull requests already exist. We'll be using them in later activities in this course.
Version control lets you make incremental changes to your code or file base while keeping the history. Git operates as a linked list, so a small history of three commits π might look like this:
In the GitHub Flow, you...
A Merge conflict occurs when someone else made a change on the base branch in the same file and location where you proposed changes. This usually happens when someone else merges in their branch before you merge yours.
This can be intimidating, but have no fear, Git knows how to handle this! It only needs a human to decide how to resolve the conflict.
Before we get too far ahead of ourselves, let's first practice making a simple change on a branch. Visualize your actions using the flow you reviewed above.
On the Code tab, click the _data/skills.yml
file
In the upper right corner of the file view, click the βοΈ icon to open the file editor
In the file, add a skill or two that you're proficient in
Scroll to the bottom of the page and select the option to "Create a new branch for this commit and start a pull request"
Replace the default patch branch name with change-skills
Select Propose file change
In the "Leave a comment" field of the pull request, describe the change you made
Click Create pull request
π§ Don't merge yet! π§ Refresh the pull request to receive the next comment/instructions.
For a printable version of the steps in this course, check out the Quick Reference Guide.
Sometimes I respond too fast for the page to update! If you perform an expected action and don't see a response from me, wait a few seconds and refresh the page for your next steps.
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.