search

datawookie / www-exegetic-biz

Website for Exegetic Analytics
https://www.exegetic.biz
0 stars 3 forks source link

Code review procedure #83

Closed GerardWalsh closed 5 years ago

datawookie commented 5 years ago

@GerardWalsh please delete your local branch. It has got a long way behind the current dev branch. Merge conflicts aplenty... :( But thanks for the PR. Appreciate the additions to the documentation.

GerardWalsh commented 5 years ago

I tried to ensure it was current by fetching from the original repository (upstream), merging upstream dev into local dev and then merging dev into my branch but seems like that didn't work.

On Fri, Jul 26, 2019 at 8:33 AM Andrew Collier notifications@github.com wrote:

@GerardWalsh https://github.com/GerardWalsh please delete your local branch. It has got a long way behind the current dev branch. Merge conflicts aplenty... :( But thanks for the PR. Appreciate the additions to the documentation.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/datawookie/www-exegetic-biz/pull/83?email_source=notifications&email_token=AGDY3IYKNHMCSHCIY36KVXLQBKLDDA5CNFSM4IGZC67KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD23URXY#issuecomment-515328223, or mute the thread https://github.com/notifications/unsubscribe-auth/AGDY3I4WHWI5DFOIW3FVGA3QBKLDDANCNFSM4IGZC67A .

-- Gerard Walsh Junior Data Scientist 082 497 8496 gerard@exegetic.biz www.exegetic.biz

datawookie commented 5 years ago

Yeah! It's a tricky business. Always best to try and keep these things current. Anyway, no stress. I sorted the conflicts.

On Fri, Jul 26, 2019 at 8:41 AM Gerard Walsh notifications@github.com wrote:

I tried to ensure it was current by fetching from the original repository (upstream), merging upstream dev into local dev and then merging dev into my branch but seems like that didn't work.

On Fri, Jul 26, 2019 at 8:33 AM Andrew Collier notifications@github.com wrote:

@GerardWalsh https://github.com/GerardWalsh please delete your local branch. It has got a long way behind the current dev branch. Merge conflicts aplenty... :( But thanks for the PR. Appreciate the additions to the documentation.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub < https://github.com/datawookie/www-exegetic-biz/pull/83?email_source=notifications&email_token=AGDY3IYKNHMCSHCIY36KVXLQBKLDDA5CNFSM4IGZC67KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD23URXY#issuecomment-515328223 , or mute the thread < https://github.com/notifications/unsubscribe-auth/AGDY3I4WHWI5DFOIW3FVGA3QBKLDDANCNFSM4IGZC67A

.

-- Gerard Walsh Junior Data Scientist 082 497 8496 gerard@exegetic.biz www.exegetic.biz

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/datawookie/www-exegetic-biz/pull/83?email_source=notifications&email_token=ABOZVCPIOLUNGR7E6F7ZMD3QBKMABA5CNFSM4IGZC67KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD23U7JQ#issuecomment-515329958, or mute the thread https://github.com/notifications/unsubscribe-auth/ABOZVCMMUUVCILK2SCMIQTTQBKMABANCNFSM4IGZC67A .

-- Andrew Collier Senior Data Scientist 083 381 3655 andrew@exegetic.biz www.exegetic.biz