Closed Twintastic closed 4 months ago
@Twintastic this PR should be good to go as soon as one more person on your team reviews it.
Thanks I’ll message them then.
On Mon, Jul 1, 2024 at 8:48 AM claesmk @.***> wrote:
@Twintastic https://github.com/Twintastic this PR should be good to go as soon as one more person on your team reviews it.
— Reply to this email directly, view it on GitHub https://github.com/NCATComp410/comp410_summer_2024/pull/23#issuecomment-2200054406, or unsubscribe https://github.com/notifications/unsubscribe-auth/A2IGWXQRJY5LUXHCRX7RH3LZKFFYFAVCNFSM6AAAAABJ6UKOI2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMBQGA2TINBQGY . You are receiving this because you were mentioned.Message ID: @.***>
After merging the other pull request I am now getting a conflict.
On Mon, Jul 1, 2024 at 11:02 AM Camryn Agee @.***> wrote:
Thanks I’ll message them then.
On Mon, Jul 1, 2024 at 8:48 AM claesmk @.***> wrote:
@Twintastic https://github.com/Twintastic this PR should be good to go as soon as one more person on your team reviews it.
— Reply to this email directly, view it on GitHub https://github.com/NCATComp410/comp410_summer_2024/pull/23#issuecomment-2200054406, or unsubscribe https://github.com/notifications/unsubscribe-auth/A2IGWXQRJY5LUXHCRX7RH3LZKFFYFAVCNFSM6AAAAABJ6UKOI2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMBQGA2TINBQGY . You are receiving this because you were mentioned.Message ID: @.***>
I need help, I can’t do anything to fix it.
On Tue, Jul 2, 2024 at 9:13 PM Camryn Agee @.***> wrote:
After merging the other pull request I am now getting a conflict.
On Mon, Jul 1, 2024 at 11:02 AM Camryn Agee @.***> wrote:
Thanks I’ll message them then.
On Mon, Jul 1, 2024 at 8:48 AM claesmk @.***> wrote:
@Twintastic https://github.com/Twintastic this PR should be good to go as soon as one more person on your team reviews it.
— Reply to this email directly, view it on GitHub https://github.com/NCATComp410/comp410_summer_2024/pull/23#issuecomment-2200054406, or unsubscribe https://github.com/notifications/unsubscribe-auth/A2IGWXQRJY5LUXHCRX7RH3LZKFFYFAVCNFSM6AAAAABJ6UKOI2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMBQGA2TINBQGY . You are receiving this because you were mentioned.Message ID: @.***>
Thank you the conflict was resolved. @claesmk
You are still waiting on review from you team before you can merge this. @JalensMindset