Skip to content

resolving conflicts with master branch #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Astrobert0 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

resolving conflicts with master branch #70

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0465f0
changed about me file
Astrobert0 Oct 31, 2020
5aee487
conflict
Astrobert0 Oct 31, 2020
3f3c003
here it is
Astrobert0 Oct 31, 2020
e94790a
added the template to introduce myself
Astrobert0 Oct 31, 2020
0fb95bc
added the introduction
Astrobert0 Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions your-code/about-me.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ----
# Who am I
I'm sebastian
* Where are you from? Venezuela
* What do you do? Working and studying
* Do you have previous experience with technology/data?Little to nothing

Carla is a passionate, honest, web developer musician and financier.
# Why am I here
To start a better career in a growing industry
* What has brought you to Ironhack? The popularity of the cohort and a scholarship
* What knowledge/skills do you expect to learn in this bootcamp? Statistics and a little bit of machine learning

Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find.
# What will I do after the bootcamp?
Apply to the junior position I'm more inclined to do it in a start up than a company with some years
* Which industry will you seek employment in? preferably in machine learnin/AI but what it matters to me is experience
* What will your future role look like? Senior programmer at a joung age maybe? I don't know
* What is your career goal? That's a question for the future sebas