GitXplorerGitXplorer
a

merge-conflicts

public
0 stars
0 forks
4 issues

Commits

List of commits on branch master.
Verified
88b51585cda45e4df7871845892738980d5cf819

Merge pull request #6 from andrewlayman/dependabot/bundler/nokogiri-1.10.8

aandrewlayman committed 5 years ago
Verified
e403cac8b2df91c2139d96fc8dbc39efe956bf14

Bump nokogiri from 1.10.5 to 1.10.8

ddependabot[bot] committed 5 years ago
Verified
b2925a304782bea08b3221b1eb84230ebd29282b

Merge pull request #4 from andrewlayman/add-education

aandrewlayman committed 5 years ago
Verified
630eeb9d09a794b0f6a46390578442a55fc087ea

Merge branch 'master' into add-education

aandrewlayman committed 5 years ago
Verified
eb1d4ea966ed765e8aa0f50fb45fdabf13dbf7bd

Merge pull request #2 from andrewlayman/education-conflict

ggithub-learning-lab[bot] committed 5 years ago
Verified
d5fe8410be27bfea7185f5b4bf7d1bfe353c9a10

Make dumb changes to the contents

aandrewlayman committed 5 years ago

README

The README file for this repository.

Your GitHub Learning Lab Repository for Managing Merge Conflicts

Welcome to your repository for your GitHub Learning Lab course. This repository will be used during the different activities that I will be guiding you through.

Oh! I haven't introduced myself...

I'm the GitHub Learning Lab bot and I'm here to help guide you in your journey to learn and master the various topics covered in this course. I will be using Issue and Pull Request comments to communicate with you. In fact, I already added an issue for you to check out.

issue tab

I'll meet you over there, can't wait to get started!

There are already some Pull Requests open, you will work on those later in the course.

This course is using the ✨ open source project resume-template. In some cases we’ve made changes to the history so it would behave during class, so head to the original project repo to learn more about the cool people behind this project.