search

DzmitrySlutskiy / EpamTraining2019

28 stars 20 forks source link

HW Git #4

Closed TashaB1 closed 5 years ago

TashaB1 commented 5 years ago

https://github.com/TashaB1/HomeWork/pull/1 @ilya-shknaj

DzmitrySlutskiy commented 5 years ago

please create via "compare" select 2 commits and update link + assign right person or at least mark him via @NICK_NAME in github

пн, 25 февр. 2019 г. в 11:28, TashaB1 notifications@github.com:

TashaB1/HomeWork#1 https://github.com/TashaB1/HomeWork/pull/1

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/DzmitrySlutskiy/EpamTraining2019/issues/4, or mute the thread https://github.com/notifications/unsubscribe-auth/AIHHF1dmvp9CmFeCb14DRqMpfu5FcFr2ks5vQ56hgaJpZM4bPVQZ .

--

С уважением, Дмитрий Слуцкий

TashaB1 commented 5 years ago

https://github.com/TashaB1/HomeWork/compare/324769d...25df7f7 @ilya-shknaj

ilya-shknaj commented 5 years ago

@TashaB1 Looks good, but please try to create and resolve conflicts one more time. I don't see in commit any changes https://github.com/TashaB1/HomeWork/commit/7bf85be2ec6d7c98b785c6e7fbdbd08cf130a24d .

Try to implement some functionality. Then reimplement it in branch1 and branch2 and after that merge result from both branches.

Also please provide link to commit where you try rebase.

ilya-shknaj commented 5 years ago

@TashaB1 reminder

TashaB1 commented 5 years ago

@ilya-shknaj conflict: https://github.com/TashaB1/HomeWork/commit/3f54c7ebecbb7e847ce0d76a8695a958700a1d49

rebase: https://github.com/TashaB1/HomeWork/commit/38e7b928d33fe3a98a134b0d305e82035f0bd1fa

ilya-shknaj commented 5 years ago

Good. Thanks