profile
viewpoint

push eventbrianamarie/hello-github-actions

Briana Swift

commit sha eab4768713a03ee903b74eb2c37072475ced4c47

Update main.yml

view details

push time in 2 days

push eventbrianamarie/hello-github-actions

Briana Swift

commit sha 44d6e5ac52341e6f6bbdbcdb5a28225628cf5651

Update main.yml

view details

push time in 2 days

push eventbrianamarie/hello-github-actions

Briana Swift

commit sha 734bf5897629a4ae2df19b9146ddff5af0c59dc5

Update entrypoint.sh

view details

push time in 2 days

create barnchbrianamarie/hello-github-actions

branch : brianamarie-patch-1

created branch time in 2 days

create barnchbrianamarie/hello-github-actions

branch : master

created branch time in 2 days

created repositorybrianamarie/hello-github-actions

created time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha 90eaa517aad8336809077492136a802cc63ee2b8

add information on metrics and measuring success

view details

Briana Swift

commit sha b3466f27ad91d8e48c8d5ffe2a3d703417c68cfb

Merge pull request #7 from brianamarie/metrics Measuring success

view details

push time in 2 days

PR merged brianamarie/innersource

Measuring success

Once you've implemented InnerSource strategies, how do you know it's working?

Challenge question

What might be some ways to measure the success of InnerSource strategies?

<hr> <h3 align="center">I'll respond when you comment on this pull request.</h3>

+17 -0

2 comments

1 changed file

github-learning-lab[bot]

pr closed time in 2 days

pull request commentbrianamarie/innersource

Measuring success

Stats

github-learning-lab[bot]

comment created time in 2 days

delete branch brianamarie/innersource

delete branch : projects

delete time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha 402b579d5bdb316a7ad029a36dbc3a2735311287

add information on managing projects

view details

Briana Swift

commit sha 0ad175b8c9a80584d77e12543aa51778cd32c1c4

Merge pull request #6 from brianamarie/projects Managing projects on GitHub

view details

push time in 2 days

PR merged brianamarie/innersource

Managing projects on GitHub

It's time to discuss project management!

Challenge question

Here's some open issues in this company project. You're eager to help with this project. Which issue should you work on?

screenshot of a repository with 5 open issues, none without labels and all opened by @githubteacher. The issues are: restyle the slides, improve the readme, add a caption to an existing slide, add a new slide, activity 1: your first caption

  • [ ] Issue 6: Restyle the slides
  • [ ] Issue 5: Improve the README
  • [ ] Issue 4: Add a caption to an existing slide
  • [x] Issue 3: Add a new slide
  • [ ] Issue 2: Activity 1: Your first caption

<hr> <h3 align="center">I'll respond when you check one of the answers above.</h3>

+7 -0

1 comment

1 changed file

github-learning-lab[bot]

pr closed time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha cc64872902fc570e8a49858509714284f9e0ab99

add information and resources on choosing a workflow

view details

Briana Swift

commit sha 3bc1665fb3764093c28cddc973d7def2bf02d1ed

Merge pull request #5 from brianamarie/workflows Workflows

view details

push time in 2 days

PR merged brianamarie/innersource

Workflows

This pull request covers a few common workflows that may be used within your organization.

Challenge question

Suppose you'd like to contribute to the repository pictured below. Which branch should you use as a base for your contributions?

a screenshot of a repository's branches, they are: a protected master branch, a protected release-v1.0 branch. The rest are unprotected: bug-fix, green-colors, config-release-drafter, add-template

  • [x] master
  • [ ] release-v1.0
  • [ ] bug-fix
  • [ ] green-colors
  • [ ] config-release-drafter

<hr> <h3 align="center">I'll respond when you check one of the boxes above.</h3>

+8 -0

1 comment

1 changed file

github-learning-lab[bot]

pr closed time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha 501f4826f9bfd7d0f5ccf6e2f02beacc39b5ff43

add resources for issue and repository templates

view details

Briana Swift

commit sha 2fd216394cb0f5e2f871eb385c783bb71c437e5a

Merge pull request #4 from brianamarie/templates Issue and PR templates

view details

push time in 2 days

PR merged brianamarie/innersource

Issue and PR templates

Let's now learn about issue and pull request templates.

Challenge question

Here are four different ways you could submit a bug report. Which is the right way?

  • [ ] Open an issue on GitHub
  • [x] Create a Jira issue
  • [ ] Open an internal support ticket
  • [ ] Direct message or email the maintainer

<hr> <h3 align="center">I'll respond when you check one of the boxes above.</h3>

+175 -0

1 comment

5 changed files

github-learning-lab[bot]

pr closed time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha 2a988513245e5655c6651dbfb05ac792bf81d0f8

add information on discoverable repositories

view details

Briana Swift

commit sha 68a73335da86842b93e4d93df14cf8d0921eedfc

Merge pull request #3 from brianamarie/discoverable-repos Create discoverable repos

view details

push time in 2 days

PR merged brianamarie/innersource

Create discoverable repos

This pull request is about making repositories discoverable.

Challenge question

What is this repository for?

gif of a repository with no description, link, or and just a few folders: .github, .vscode, _appendix, _events, _includes, _layouts

<hr> <h3 align="center">I'll respond when I detect your new comment on this pull request.</h3>

+119 -0

2 comments

2 changed files

github-learning-lab[bot]

pr closed time in 2 days

pull request commentbrianamarie/innersource

Create discoverable repos

who knows

github-learning-lab[bot]

comment created time in 2 days

push eventbrianamarie/innersource

GitHub Teacher

commit sha 860a6c74b8a09bd1ed0088dbdef71e41584bf0c7

add information on repository ownership

view details

Briana Swift

commit sha 4e65ae5d94ae5dec94b5c352119e1d747abbd585

Merge pull request #2 from brianamarie/repo-owner Repository ownership and names

view details

push time in 2 days

PR merged brianamarie/innersource

Repository ownership and names

This pull request is about repository ownership and naming conventions.

Challenge question

Does a repository exist at https://github.com/githubtraining/training-manual?

  • [ ] True, there is a repository at the given URL
  • [x] False, no repository exists at the given URL

<hr> <h3 align="center">I'll respond when you check one of the boxes above.</h3>

+10 -0

1 comment

1 changed file

github-learning-lab[bot]

pr closed time in 2 days

create barnchbrianamarie/innersource

branch : master

created branch time in 2 days

create barnchbrianamarie/innersource

branch : discoverable-repos

created branch time in 2 days

create barnchbrianamarie/innersource

branch : projects

created branch time in 2 days

create barnchbrianamarie/innersource

branch : templates

created branch time in 2 days

create barnchbrianamarie/innersource

branch : repo-owner

created branch time in 2 days

create barnchbrianamarie/innersource

branch : metrics

created branch time in 2 days

create barnchbrianamarie/innersource

branch : workflows

created branch time in 2 days

created repositorybrianamarie/innersource

created time in 2 days

pull request commentgithubtraining/github-pages

Add Spanish translation

I did need to manually sync the course, but it seems to be working! 🎉 Thank you so much, @mberasategi @arielvalentin!

mberasategi

comment created time in 2 days

push eventgithubtraining/github-pages

mberasategi

commit sha 4e9e49768470edc4c424e53cad7657577b04f7ce

Translate responses

view details

mberasategi

commit sha 453062daa9ed9c7a80db8a765b8b5853f87aae56

Add language and step translations

view details

mberasategi

commit sha bc1bd3a46fea4d93c4dcf7363fc35127edc8297c

Correct indentation of language options

view details

Miren

commit sha 052be7903d55bc5fc74223cb6d5144f06bfaf5a3

Add 'w. Spanish' to title

view details

Miren

commit sha 8687a89b1e9bdb44a233d3d77fdc9dfd0e98d990

Revert title (sorry!)

view details

mberasategi

commit sha e1313d109f107df6cccff523a1660145f2f7d1ed

Add opening exclamation and question marks

view details

mberasategi

commit sha 49e34fac24a9f109da36e9d98b68184ed5bd1223

Forgot to translate pages

view details

Miren

commit sha 1ea315a74f93f04ec06cb8ac081f02387b1720bb

Fix italics in parenthesis Update responses/es/00_class-introduction-issue.md Co-Authored-By: Briana Swift <brianamarie@github.com>

view details

Briana Swift

commit sha e3acf5fc64ff6205f4931b6591d00278a4dba981

Merge pull request #25 from mberasategi/master Add Spanish translation

view details

push time in 2 days

PR merged githubtraining/github-pages

Reviewers
Add Spanish translation

I would like to use this course (and others) with my students but they need to be in Spanish, so I translated this one to begin with. I've added the responses files and some options I found in the "Introduction to GitHub" course to the config, but I'm not sure if that's enough or a new language needs to be setup somewhere else.

+311 -16

11 comments

14 changed files

mberasategi

pr closed time in 2 days

pull request commentgithubtraining/github-pages

Add Spanish translation

@mberasategi Thanks! The deploy worked fine when I brought your changes onto a githubtraining branch, so I wonder if that could be the problem. I'll merge, and I'll watch out for the deployment.

mberasategi

comment created time in 2 days

issue commentgithub/training-kit

PDF

Hi @kerolloz! Typically, we have made the cheat sheets into PDFs with Adobe Illustrator, and have the template internally. For cheat sheets without a pre-made PDF, we've seen users print the formatted markdown. I don't know if we've ever had a user create a PDF with the current formatting.

Which language are you wanting to create a PDF for? @hectorsector, do you know if we'd be able to share the illustrator template to enable community contributions for PDFs?

kerolloz

comment created time in 2 days

pull request commentgithub/training-kit

Turkish language

Hello @BgR8! Thank you for these contributions. ✨

With translations, we typically like to get one community review before merging. Do you know of anyone else on GitHub that would be able to review the Turkish part of this pull request?

BgR8

comment created time in 2 days

delete branch githubtraining/github-pages

delete branch : test-mberasategi

delete time in 2 days

PR closed githubtraining/github-pages

Test mberasategi - testing only PR

This pull request is only to test the work being done in #25. I will close once the deployment is done and I have tested.

+311 -16

1 comment

14 changed files

brianamarie

pr closed time in 2 days

Pull request review commentgithubtraining/github-pages

Add Spanish translation

+## Paso 1: Activa GitHub Pages++¡Bienvenida a GitHub Pages y Jekyll! :tada:++Si es la primera vez que usas GitHub Pages o quieres aprender cómo crear y alojar un sitio web con [GitHub Pages](https://pages.github.com), estás en el lugar adecuado. Con GitHub Pages, puedes alojar contenidos como [documentación](https://flight-manual.atom.io/), [currículums](https://github.com/jglovier/resume-template) o cualquier otro contenido estático que quieras. ++En este curso crearás un blog alojado en GitHub Pages y aprenderas a:++- Activar GitHub Pages+- Usar [Jekyll](https://jekyllrb.com/), un generador de sitios estáticos+- Personalizar el aspecto y contenido de sitios creados con Jekyll++### ¿GitHub es nuevo para ti?++Para este curso necesitas saber cómo crear una rama (_branch_) en GitHub, confirmar cambios (_commit_) usando Git, y abrir peticiones de extracción (_pull requests_) en GitHub. Si necesitas un recordatorio del flujo de trabajo en GitHub, revisa el [curso de Introducción a GitHub]({{ host }}/courses/introduction-to-github).++### :keyboard: Actividad: Genera un sitio web con GitHub Pages++El primer paso para publicar tu blog en la web es activar GitHub Pages en este repositorio <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. Cuando habilitas GitHub Pages para un repositorio, GitHub toma el contenido que tenga en el branc `master` y publica un sitio web basado en esos contenidos.++1. Debajo del nombre de tu repositorio, haz clic en [**Settings**]({{ repoUrl }}/settings) (Ajustes).+1. En la sección "GitHub Pages", en el desplegable Source, selecciona **master branch**.++Una vez que GitHub Pages se ha activado y se ha iniciado el sitio web, estaremos listos para crear algún contenido más. ++> Activar GitHub Pages crea una implementación de tu repositorio. Puede llevarme hasta un minuto contestar mientras espero a la implementación.++<hr>+<h3 align="center">Vuelve a esta propuesta (_issue_) para mi siguiente comentario.</h3>
<h3 align="center">Vuelve a esta propuesta _(issue)_ para mi siguiente comentario.</h3>

This wasn't formatting properly, but this should fix it!

mberasategi

comment created time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha b96fee6e0b1600f54d84e5359077cca8599be7ad

Update _config.yml

view details

Briana Swift

commit sha 3a42a7c355e6ea07157de0d4b3c39d00605d178d

Update 2019-10-15-my-first-blog-post.md

view details

Briana Swift

commit sha 55cc691a4d86ab6f0f9d85594565d8c8a5f3a31a

Update 2019-10-15-my-first-blog-post.md

view details

Briana Swift

commit sha 88fcfa0c82dff4c166f94f531ecd745c9c7c2a4b

Merge pull request #4 from brianamarie/brianamarie-patch-2 Update _config.yml

view details

push time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha 55cc691a4d86ab6f0f9d85594565d8c8a5f3a31a

Update 2019-10-15-my-first-blog-post.md

view details

push time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha 3a42a7c355e6ea07157de0d4b3c39d00605d178d

Update 2019-10-15-my-first-blog-post.md

view details

push time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : brianamarie-patch-2

created branch time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha a471146b5e692099e764274d1ca028df2b532db0

Update index.md

view details

Briana Swift

commit sha 1580a348bc92907e7f22bcfc48d22a1711d0873f

Merge pull request #2 from brianamarie/brianamarie-patch-1 Update index.md

view details

push time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : brianamarie-patch-1

created branch time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : master

created branch time in 2 days

created repositorybrianamarie/github-pages-with-jekyll

created time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha 93c8d2dd80b01cd754f5df75533651473c468fd6

Update _config.yml

view details

Briana Swift

commit sha 826f05a8c912c24790431bde5f57fa82ca545b8d

Update 2019-10-15-my-first-blog-post.md

view details

Briana Swift

commit sha f4c177563740848bbaa40ec2396ebdcfdcd54cb9

Update 2019-10-15-my-first-blog-post.md

view details

Briana Swift

commit sha ba4277ee8c044c4436ce1030a73dbd75025e625b

Merge pull request #4 from brianamarie/brianamarie-patch-2 Update _config.yml

view details

push time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha f4c177563740848bbaa40ec2396ebdcfdcd54cb9

Update 2019-10-15-my-first-blog-post.md

view details

push time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha 826f05a8c912c24790431bde5f57fa82ca545b8d

Update 2019-10-15-my-first-blog-post.md

view details

push time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : brianamarie-patch-2

created branch time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : brianamarie-patch-1

created branch time in 2 days

delete branch brianamarie/github-pages-with-jekyll

delete branch : brianamarie-patch-1

delete time in 2 days

push eventbrianamarie/github-pages-with-jekyll

Briana Swift

commit sha fc860a70c722aa4ee7ebc687247bcd83a79138be

Update index.md

view details

Briana Swift

commit sha b23e798c5b87a0a646bf61a730c498d359ceffc0

Merge pull request #2 from brianamarie/brianamarie-patch-1 Update index.md

view details

push time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : brianamarie-patch-1

created branch time in 2 days

create barnchbrianamarie/github-pages-with-jekyll

branch : master

created branch time in 2 days

created repositorybrianamarie/github-pages-with-jekyll

created time in 2 days

PR opened githubtraining/github-pages

Test mberasategi - testing only PR

This pull request is only to test the work being done in #25. I will close once the deployment is done and I have tested.

+311 -16

0 comment

14 changed files

pr created time in 2 days

create barnchgithubtraining/github-pages

branch : test-mberasategi

created branch time in 2 days

pull request commentgithubtraining/github-pages

Add Spanish translation

Hi @mberasategi @arielvalentin! I am going to test this myself. I trust the Spanish but I want to make sure the course will function. I'll report back here once I've finished, and either merge, or let you know what is left. 😊 Thank you so much for your work here!

mberasategi

comment created time in 2 days

push eventgithub/training-kit

Hariom Verma

commit sha f4c93bf9482206fca2eeb1b6f26db6d375c6a68c

Hindi Translation of Git Cheat Sheet

view details

Briana Swift

commit sha 16b3aeaaa3ff56facc71eb1996cd894a3d6ec3f4

Merge pull request #697 from harry-hov/master Hindi Translation of Git Cheat Sheet

view details

push time in 2 days

PR merged github/training-kit

Hindi Translation of Git Cheat Sheet

Overview

TL;DR <One to two sentence description of the issue you are encountering or trying to solve.>

<Link to related issue. Type closes #RELATEDISSUENUMBER to establish a link.>

Questions

<If relevant, write a list of questions that you would like to discuss related to the changes that you have made.>

Next Steps

<If incomplete, create a task list of items that are still being worked on within the Pull Request.>

Review

@abhitidarbar @udaymewada Review the Hindi Translation and Let me know If correction needed.

+248 -0

2 comments

2 changed files

harry-hov

pr closed time in 2 days

pull request commentgithub/training-kit

Hindi Translation of Git Cheat Sheet

Yes let's merge! Historically, one review is good to merge. Thank you so much @harry-hov @udaymewada @brntbeer! 🎉

harry-hov

comment created time in 2 days

pull request commentgithubtraining/reviewing-a-pull-request-template

[Snyk] Fix for 1 vulnerabilities

All works as expected 👍

snyk-bot

comment created time in 2 days

delete branch githubtraining/reviewing-a-pull-request-template

delete branch : snyk-fix-acdc4533e41331b0d765f5ad83700d30

delete time in 2 days

Pull request review commentbrianamarie/reviewing-a-pull-request

Update Game Instructions

 A project based learning activity for people who are getting started with Git an  You can play the game at: https://githubschool.github.io/github-games/ +### Instructions for playing the game++1. Press the space bar to begin.+2. Use the up and down arrow keys to rotate the shape.

Comment

github-learning-lab[bot]

comment created time in 2 days

create barnchbrianamarie/reviewing-a-pull-request

branch : update-colors

created branch time in 2 days

create barnchbrianamarie/reviewing-a-pull-request

branch : master

created branch time in 2 days

create barnchbrianamarie/reviewing-a-pull-request

branch : add-multiple-colors

created branch time in 2 days

create barnchbrianamarie/reviewing-a-pull-request

branch : update-readme

created branch time in 2 days

create barnchbrianamarie/reviewing-a-pull-request

branch : game-instructions

created branch time in 2 days

created repositorybrianamarie/reviewing-a-pull-request

created time in 2 days

push eventgithubtraining/reviewing-a-pull-request-template

snyk-bot

commit sha 646497e08040cae7cd138e3a996125de9ef2097b

fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RUBYZIP-469156

view details

Briana Swift

commit sha 5321a65a0d54093fcf3d8e7ff76ba1be58923c2a

Merge pull request #4 from githubtraining/snyk-fix-acdc4533e41331b0d765f5ad83700d30 [Snyk] Fix for 1 vulnerabilities

view details

push time in 2 days

PR merged githubtraining/reviewing-a-pull-request-template

[Snyk] Fix for 1 vulnerabilities

Description

This PR fixes one or more vulnerable packages in the rubygems dependencies of this project. See the Snyk test report for more details.

Snyk Project: githubtraining/reviewing-a-pull-request-template:Gemfile.lock

Snyk Organization: brianamarie

Changes included in this PR

  • Changes to the following files to upgrade the vulnerable dependencies to a fixed version:
    • Gemfile
    • Gemfile.lock

Vulnerabilities that will be fixed

With an upgrade:

You can read more about Snyk's upgrade and patch logic in Snyk's documentation.

Check the changes in this PR to ensure they won't cause issues with your project.

Stay secure, The Snyk team

Note: You are seeing this because you or someone else with access to this repository has authorised Snyk to open Fix PRs. To review the settings for this Snyk project please go to the project settings page.

+47 -46

2 comments

2 changed files

snyk-bot

pr closed time in 2 days

pull request commentgithubtraining/reviewing-a-pull-request-template

[Snyk] Fix for 1 vulnerabilities

Merging - will test next for any unforseen breaks.

snyk-bot

comment created time in 2 days

pull request commentgithubtraining/react-solution

Bump eslint-utils from 1.3.1 to 1.4.2

@dependabot merge

dependabot[bot]

comment created time in 2 days

pull request commentgithubtraining/react-solution

Bump lodash.template from 4.4.0 to 4.5.0

@dependabot merge

dependabot[bot]

comment created time in 2 days

pull request commentgithubtraining/react-solution

Bump mixin-deep from 1.3.1 to 1.3.2

@dependabot merge

dependabot[bot]

comment created time in 2 days

delete branch githubtraining/merge-conflict-template-repo

delete branch : snyk-fix-fe2f6024e5569fb7fccb556a5d09bdf7

delete time in 2 days

pull request commentgithubtraining/merge-conflict-template-repo

[Snyk] Fix for 1 vulnerabilities

Can confirm, course still works as expected 👍

snyk-bot

comment created time in 2 days

delete branch brianamarie/merge-conflicts

delete branch : add-education

delete time in 2 days

push eventbrianamarie/merge-conflicts

GitHub Teacher

commit sha b05509ab7cdc9a5a2b356d07958a5cc8c13fb9b0

commit for education branch

view details

Briana Swift

commit sha f8d0d149a90ccdc0b3642b645320a2e163c59ea0

Update education.yml

view details

Briana Swift

commit sha ee19c07354110a5e63b1e8dc02cc395942c9814b

Merge branch 'master' into add-education

view details

Briana Swift

commit sha 87863ff340f36e2a2e5e9c940b1e27a6de7a6f0b

Merge pull request #4 from brianamarie/add-education Create your own conflict

view details

push time in 2 days

PR merged brianamarie/merge-conflicts

Create your own conflict

Step 5: Create your own conflict

So far, this pull request doesn't have any conflicts. I have added some new branch protections to prevent you from merging before you're ready.

In the last activity, you solved a merge conflict that someone else created. This time, you'll create the merge conflict yourself.

:keyboard: Activity: Make changes on this branch

  1. Click on the Files changed tab in this pull request.
  2. Click the :pencil2: found in the top right-hand corner of the _data/education.yml file that had been previously modified.
  3. Modify the content in the degree:, uni:, year:, and summary: lines.
  4. Scroll to the bottom of the page and enter a commit message for your change.
  5. Click the Commit changes button, making sure the "Commit directly to the add-education branch" option is selected.

<hr> <h3 align="center">Watch below for my response.</h3>

+6 -5

2 comments

1 changed file

github-learning-lab[bot]

pr closed time in 2 days

push eventbrianamarie/merge-conflicts

GitHub Teacher

commit sha 4cbe0fe45595d99d49e26703532c114b0572bb96

Resolve merge conflict without checking

view details

GitHub Teacher

commit sha 6d8bbbc198af37ed94f613e47d71455c8576a4f9

Change skatetocat to surftocat

view details

GitHub Teacher

commit sha 67adaeffb869845d305b3551b40cda339e1e0d6c

Add surfing and internship experience

view details

GitHub Teacher

commit sha a82fbfc2bd9ce82a72bf4fe5f2c602e31f1d07f9

Add artifacts

view details

GitHub Teacher

commit sha 1363a52534bca4239523967c2c65f410e3112e6f

Update README.md

view details

GitHub Teacher

commit sha 8f0f219cd53ff347ea6cabb4c1aa44e363746865

Minor syntax update

view details

GitHub Teacher

commit sha 4de72bb1f9a4228c0a2ee2b934ebaa20d94f89d3

Replace issue tab link

view details

GitHub Teacher

commit sha c2dd6e978e1aaae921706c2f4b73b156d221ed58

Update README.md

view details

GitHub Teacher

commit sha 278f6591bfc0870070576470496cfab2191656c7

Update README.md

view details

GitHub Teacher

commit sha c41e33228e3c9654f2e0dd627d39d86f9ee71884

Update README.md

view details

snyk-bot

commit sha 97f727d93fbe4a0601f910e7727a6fa19259fe86

fix: Gemfile.lock & Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-FFI-22037 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-72433

view details

GitHub Teacher

commit sha 705a4c89550e8512f64ed2987514642fea664b16

Merge pull request #1 from githubtraining/snyk-fix-levx48 [Snyk] Fix for 2 vulnerable dependencies

view details

GitHub Teacher

commit sha 0e28c721ccd31d3de095d4c394dae969d1f05f28

add GitHubteacher info to config

view details

GitHub Teacher

commit sha 806f4a5510e7bd6d85595455159f1a16ada79667

add experience

view details

GitHub Teacher

commit sha b7c7ed4dff63a6d5531a4f17e298e87a5015b8ed

add education conflict content

view details

snyk-test

commit sha f5bcba3ae1edb616927d60b41ec7d271d29bebd6

fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-459107

view details

Cynthia Rich

commit sha 40c2a6f1af1d468637bae7f4723ceaf989781f00

thanks to the authors of the original project

view details

Cynthia Rich

commit sha c144d5244fd9dfe98c312b3374853fa129db4d54

update dependencies

view details

Briana Swift

commit sha 71683a11ec8946f9d02455c3a235f1f09ad3c29a

resolve conflict

view details

Briana Swift

commit sha 9ecf26fa820800e0e2fa69cc6dc953765bb5eabd

make surre correct version of bundler is specified

view details

push time in 2 days

push eventbrianamarie/merge-conflicts

Briana Swift

commit sha f8d0d149a90ccdc0b3642b645320a2e163c59ea0

Update education.yml

view details

push time in 2 days

delete branch brianamarie/merge-conflicts

delete branch : add-experience

delete time in 2 days

push eventbrianamarie/merge-conflicts

GitHub Teacher

commit sha 806f4a5510e7bd6d85595455159f1a16ada79667

add experience

view details

Briana Swift

commit sha 9629b6623ec46e6c278856f1bc4f59e957c29dbc

Merge branch 'master' into add-experience

view details

Briana Swift

commit sha 5c174ec2d302fa591ffd15f1b60f202a27297192

Merge pull request #3 from brianamarie/add-experience More conflicts

view details

push time in 2 days

PR merged brianamarie/merge-conflicts

More conflicts

Step 3: Resolve more complex conflicts

Just like your first conflict, this pull request is already conflicted.

This time, however, I've made it a bit more complicated.

  • Instead of one conflict, you get three!
  • Instead of conflicts in one file only, you get two!
  • One of your files actually has some leftover merge conflict markers. This can happen if someone forgets to remove the markers while resolving a conflict.

:keyboard: Activity: Resolve these conflicts

  1. Click Resolve conflicts.
  2. On the left, you will notice two files listed: _data/experience.yml and _data/interests.yml. Let's start with _data/experience.yml.
  3. Remove the conflict markers and pick your desired content.
  4. With the merge conflicts resolved and the markers removed in the _data/experience.yml file, click Mark as resolved.
  5. GitHub will present the next file with conflicts, _data/interests.yml.
  6. Remove the conflict markers and pick your desired content.
  7. When you are finished, click Mark as resolved.
  8. Click Commit merge.

<hr> <h3 align="center">Watch below for my response.</h3>

+10 -6

1 comment

2 changed files

github-learning-lab[bot]

pr closed time in 2 days

push eventbrianamarie/merge-conflicts

GitHub Teacher

commit sha 4cbe0fe45595d99d49e26703532c114b0572bb96

Resolve merge conflict without checking

view details

GitHub Teacher

commit sha 6d8bbbc198af37ed94f613e47d71455c8576a4f9

Change skatetocat to surftocat

view details

GitHub Teacher

commit sha 67adaeffb869845d305b3551b40cda339e1e0d6c

Add surfing and internship experience

view details

GitHub Teacher

commit sha a82fbfc2bd9ce82a72bf4fe5f2c602e31f1d07f9

Add artifacts

view details

GitHub Teacher

commit sha 1363a52534bca4239523967c2c65f410e3112e6f

Update README.md

view details

GitHub Teacher

commit sha 8f0f219cd53ff347ea6cabb4c1aa44e363746865

Minor syntax update

view details

GitHub Teacher

commit sha 4de72bb1f9a4228c0a2ee2b934ebaa20d94f89d3

Replace issue tab link

view details

GitHub Teacher

commit sha c2dd6e978e1aaae921706c2f4b73b156d221ed58

Update README.md

view details

GitHub Teacher

commit sha 278f6591bfc0870070576470496cfab2191656c7

Update README.md

view details

GitHub Teacher

commit sha c41e33228e3c9654f2e0dd627d39d86f9ee71884

Update README.md

view details

snyk-bot

commit sha 97f727d93fbe4a0601f910e7727a6fa19259fe86

fix: Gemfile.lock & Gemfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-FFI-22037 - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-72433

view details

GitHub Teacher

commit sha 705a4c89550e8512f64ed2987514642fea664b16

Merge pull request #1 from githubtraining/snyk-fix-levx48 [Snyk] Fix for 2 vulnerable dependencies

view details

GitHub Teacher

commit sha 0e28c721ccd31d3de095d4c394dae969d1f05f28

add GitHubteacher info to config

view details

snyk-test

commit sha f5bcba3ae1edb616927d60b41ec7d271d29bebd6

fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-NOKOGIRI-459107

view details

Cynthia Rich

commit sha 40c2a6f1af1d468637bae7f4723ceaf989781f00

thanks to the authors of the original project

view details

Cynthia Rich

commit sha c144d5244fd9dfe98c312b3374853fa129db4d54

update dependencies

view details

Briana Swift

commit sha 71683a11ec8946f9d02455c3a235f1f09ad3c29a

resolve conflict

view details

Briana Swift

commit sha 9ecf26fa820800e0e2fa69cc6dc953765bb5eabd

make surre correct version of bundler is specified

view details

Briana Swift

commit sha 9d883df11d37e19911388890a3485dd90f7f8eb5

Merge pull request #2 from githubtraining/snyk-fix-300eb5a6079f0b86dbdf9605879da1b0 [Snyk] Fix for 1 vulnerable dependencies

view details

snyk-bot

commit sha d9db26edf978ad2f4828d993eb9e48e10eaca98e

fix: Gemfile & Gemfile.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-RUBY-RUBYZIP-469156

view details

push time in 2 days

delete branch brianamarie/merge-conflicts

delete branch : update-config

delete time in 2 days

more