munkkeli / merge-conflict Goto Github PK
View Code? Open in Web Editor NEWHome Page: https://lab.github.com/courses/managing-merge-conflicts
License: MIT License
Home Page: https://lab.github.com/courses/managing-merge-conflicts
License: MIT License
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:
Turning on GitHub Pages creates a deployment of your repository. I may take up to a minute to respond as I await the deployment.
To modify the other sections of the resume, simply create a new branch and modify the the files found in the _data
folder.
For instance, to modify the "Projects" section, edit the _data/projects.yml
file. After making your changes, create a new pull request with your branch 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
.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 solve a total of four merge conflicts, and you'll understand why merge conflicts happen. 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 to solve them using the command line or other local tools, the course will still work.
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 is all about making incremental changes to your code or file base. We'll start with the standard workflow, and add a few pictures to help us form a mental model.
Git operates as a linked list. A small history of three commits might look like this:
In the GitHub Flow, you...
Merge conflicts happen when someone else made a change on the master
branch in the same file and location where you were making changes. This usually happens when someone else merges in their branch before you merge yours.
Have no fear, Git knows how to handle this -- and it is why Git creates merge conflicts.
Before we get too far ahead of ourselves, let's practice making a simple change on a branch. Visualize your actions using the mental model above.
_data/skills.yml
filechange-skills
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.