Closed adedamola-toye closed 1 week ago
Please can you resolve the merge conflict locally then commit the changes again to the same branch? Thank you!
Please can you resolve the merge conflict locally then commit the changes again to the same branch? Thank you!
@adedamola-toye you can just git pull from the main branch then compare locally after that pushed the resolved code. Thank you!
Okay I will.
On Wed, 16 Oct 2024, 22:19 Shegzi, @.***> wrote:
Please can you resolve the merge conflict locally then commit the changes again to the same branch? Thank you!
@adedamola-toye https://github.com/adedamola-toye you can just git pull from the main branch then compare locally after that pushed the resolved code. Thank you!
— Reply to this email directly, view it on GitHub https://github.com/GitHub-Campus-Experts-Unilag/DevzenFrontend/pull/13#issuecomment-2417985514, or unsubscribe https://github.com/notifications/unsubscribe-auth/AYTIVE2PJ657NFZPRNY4J43Z33J7HAVCNFSM6AAAAABP5P7PESVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIMJXHE4DKNJRGQ . You are receiving this because you were mentioned.Message ID: @.*** com>
Built Number Base Converter Page