search

BigSamu / Dev-Bot

MIT License
1 stars 2 forks source link

[REFACTOR] Refactoring Code - Services, Controllers and Routes createade and Utils and Webhooks updated #41

Closed BigSamu closed 10 months ago

BigSamu commented 10 months ago

Issue #32 is addressed on this PR. PR opened for review and merge with base code

vercel[bot] commented 10 months ago

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment | Name | Status | Preview | Comments | Updated (UTC) | | :--- | :----- | :------ | :------- | :------ | | **opensearch-bot** | ⬜️ Ignored ([Inspect](https://vercel.com/open-search-bot/opensearch-bot/C7Q86eP2JyH3xUemKsYUBco18kCM)) | [Visit Preview](https://opensearch-bot-git-refactor-add-routes-c-53ce70-open-search-bot.vercel.app) | | Dec 31, 2023 7:22pm |
BigSamu commented 10 months ago

@JohnathonBowers,

Question regarding commit 0d3b10d. What was this merge about? I did the merges on Friday with the main branch. The question is, are there no conflicts currently with that branch?

JohnathonBowers commented 10 months ago

@JohnathonBowers,

Question regarding commit 0d3b10d. What was this merge about? I did the merges on Friday with the main branch. The question is, are there no conflicts currently with that branch?

I had made some changes on my local tracking branch before you merged main into the upstream refactor branch. I needed to merge these upstream changes into my local tracking branch so that any code I pushed to the upstream branch wouldn't create conflicts. To answer your question, everything is in sync now.

BigSamu commented 10 months ago

@JohnathonBowers, Question regarding commit 0d3b10d. What was this merge about? I did the merges on Friday with the main branch. The question is, are there no conflicts currently with that branch?

I had made some changes on my local tracking branch before you merged main into the upstream refactor branch. I needed to merge these upstream changes into my local tracking branch so that any code I pushed to the upstream branch wouldn't create conflicts. To answer your question, everything is in sync now.

Perfect!