Zapocet2

[xpapulak]

Dobry den, Posielam opravu zápočtu

[ZitaNemeckova]

• [X] update your branch & resolve conflicts (hint: rebase) (20%) -10% first commit contains weird changes

• [x] reorder commits so that next class-related commits(questions 3, 5, 7) are together (10%)

• [X] squash next class-related commits into one (hint: you should use two s not three) (20%)

• [x] delete commit with question 1 (10%)

• [x] rename commits about your previous experience with Git (questions 2, 4) to be in UPERCASE (hint: you do not rename the commit at the same time as you write r but later) (20%)

• [x] edit commit that mentions SVN so answer is Noooooooooooo or Yesssssssssss (hint: you have to add changed file and amend commit) (20%)

Final score = 90%

[xpapulak]

Dobry deň, Prosím Vás, tento Pull Request bola len tá prvá polovica príkladu ale nemala som conflicts tak som čakala na Vás. Viem že všetky tie body potrebné na zápočet nemám spravené, lebo som sa k nim kvôli tomu ešte nedostala.

[himdel]

Dobry den, tento PR byl otevreny 15 dni beze zmeny a bez jakekoli indikace ze ceka na nas. Nove hodnoceni jiz bylo odeslano vyucujicim.

Jestli chcete, muzete dokoncit interaktivni rebase, do konce tydne (11.1.), a posleme jim jeste aktualizovanou verzi. Negarantuji ze ji budou respektovat :).

[xpapulak]

Dobrý deň, No ja som vám napísala komentár do pull requestu a aj email. Ale ďakujem za šancu pošlem Vám to.

Dňa po, 6. jan 2020, 14:52 Martin Hradil notifications@github.com napísal(a):

Reopened #65 https://github.com/RoadToSoftwareFactory/SWI-2019/pull/65.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/RoadToSoftwareFactory/SWI-2019/pull/65?email_source=notifications&email_token=ANO5OBBORPZJK7JCDCCNN5DQ4MZSPA5CNFSM4J6NOHF2YY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGOVZGKHHY#event-2924258207, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANO5OBDSVNBFOPQQLK5AGO3Q4MZSPANCNFSM4J6NOHFQ .

[xpapulak]

Prosím Vás, mohli by ste niečo zmeniť v "Exam" aby som mohla pracovať s konfliktami ? Ďakujem

[himdel]

@xpapulak Conflict vytvoren :)

[xpapulak]

please review @himdel @ZitaNemeckova

[ZitaNemeckova]

@xpapulak Updated score :)