search

kuhn-ruess / Checkmk-Checks

Checks and Stuff for Check_MK
MIT License
40 stars 22 forks source link

Updated details #46

Closed carkle1971 closed 1 year ago

carkle1971 commented 1 year ago

Details updated

Bastian-Kuhn commented 1 year ago

Hi @carkle1971

The merge leads to 3 conflicts which need to be solved (Basically, Git does not know which line of the file is the one to use). Normally does not happen when you are alone working in a branch, where nobody else changed files. So I'm wondering what happened there.

More information also here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

Bastian-Kuhn commented 1 year ago

Just a few lines left, then I can merge

carkle1971 commented 1 year ago

Should be okay now

Met vriendelijke groet, Kind Regards, Bien à vous, Med vennlig hilsen, Mit freundlichen Grüßen, Carlo Kleinloog

From: Bastian Kuhn @.> Sent: Monday, March 6, 2023 9:55 AM To: kuhn-ruess/Checkmk-Checks @.> Cc: Kleinloog, Carlo (Bilfinger Shared Services B.V.) @.>; Mention @.> Subject: [EXTERNAL] Re: [kuhn-ruess/Checkmk-Checks] Updated details (PR #46)

This e-mail is from an external source - be cautious, particularly with links, attachments and unusual requests.

Just a few lines left, then I can merge

— Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_kuhn-2Druess_Checkmk-2DChecks_pull_46-23issuecomment-2D1455727381&d=DwMCaQ&c=HIZawdDzIngf9EKVx3dimYy9B-kGp4mNBCT5TYgJGOg&r=OI3JArAupJom1QQBULWSwRLKH_GqWOhlBQcH8zN1Pe4&m=NRXMi9DiHejx2cEm75iPjAPTNO0Lwvw-gYxJZJKj1DXq7x5l2qSLxPO6v2NJGXD0&s=e0Klqme2nPK-ZT51uTSIGx8koGwXlr4wv6RzAYnbVys&e=, or unsubscribehttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AUSYL6ITX75BAVXYRSCGA5TW2WQ53ANCNFSM6AAAAAAVC7MIHI&d=DwMCaQ&c=HIZawdDzIngf9EKVx3dimYy9B-kGp4mNBCT5TYgJGOg&r=OI3JArAupJom1QQBULWSwRLKH_GqWOhlBQcH8zN1Pe4&m=NRXMi9DiHejx2cEm75iPjAPTNO0Lwvw-gYxJZJKj1DXq7x5l2qSLxPO6v2NJGXD0&s=R-vjPF32ypHemfLVSdqK3WuqPjhE2z_dMe0baJrjLFg&e=. You are receiving this because you were mentioned.Message ID: @.**@.>>

Bastian-Kuhn commented 1 year ago

@carkle1971 sadly not, but I tried to resolve the conflicts. Can you just double-check if I am not breaking something? You will see my merge commit in the history now. Just give me the go after and I merge.

carkle1971 commented 1 year ago

Looks okay to me. And now I see what I have done wrong. Thank you. I learn from this. Like I said before, I’m a newbie

Met vriendelijke groet, Kind Regards, Bien à vous, Med vennlig hilsen, Mit freundlichen Grüßen, Carlo Kleinloog

From: Bastian Kuhn @.> Sent: Monday, March 6, 2023 10:53 AM To: kuhn-ruess/Checkmk-Checks @.> Cc: Kleinloog, Carlo (Bilfinger Shared Services B.V.) @.>; Mention @.> Subject: [EXTERNAL] Re: [kuhn-ruess/Checkmk-Checks] Updated details (PR #46)

This e-mail is from an external source - be cautious, particularly with links, attachments and unusual requests.

@carkle1971https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_carkle1971&d=DwMCaQ&c=HIZawdDzIngf9EKVx3dimYy9B-kGp4mNBCT5TYgJGOg&r=OI3JArAupJom1QQBULWSwRLKH_GqWOhlBQcH8zN1Pe4&m=Jiz0rLuUFzfyCvruc8ArQvED4zumNc2N13Y4rdfc_8-RCQpVyKNQP3xTQS4PGn6I&s=dwEDTBSlM_mY4J_-BJuU4P9I4MHF_BcflynlvAnFO5A&e= sadly not, but I tried to resolve the conflicts. Can you just double-check if I am not breaking something? You will see my merge commit in the history now. Just give me the go after and I merge.

— Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_kuhn-2Druess_Checkmk-2DChecks_pull_46-23issuecomment-2D1455814411&d=DwMCaQ&c=HIZawdDzIngf9EKVx3dimYy9B-kGp4mNBCT5TYgJGOg&r=OI3JArAupJom1QQBULWSwRLKH_GqWOhlBQcH8zN1Pe4&m=Jiz0rLuUFzfyCvruc8ArQvED4zumNc2N13Y4rdfc_8-RCQpVyKNQP3xTQS4PGn6I&s=x5__s6BMg3G-Kh4TaxcIKve29RXpK_61FF-TPwivm2w&e=, or unsubscribehttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AUSYL6I2IKWWTTHJYXHXHJTW2WXX5ANCNFSM6AAAAAAVC7MIHI&d=DwMCaQ&c=HIZawdDzIngf9EKVx3dimYy9B-kGp4mNBCT5TYgJGOg&r=OI3JArAupJom1QQBULWSwRLKH_GqWOhlBQcH8zN1Pe4&m=Jiz0rLuUFzfyCvruc8ArQvED4zumNc2N13Y4rdfc_8-RCQpVyKNQP3xTQS4PGn6I&s=_jXscvlca4Pb6QdIaONrOxEvo_oyRyqUl0U5lzTNyTE&e=. You are receiving this because you were mentioned.Message ID: @.**@.>>

Bastian-Kuhn commented 1 year ago

Thank you