search

CSNSE / casm2

0 stars 0 forks source link

Fix conflicts in master vs testing #21

Closed spatel2024 closed 9 months ago

spatel2024 commented 9 months ago

Go through lines of code to resolve the differences between branches.

spatel2024 commented 9 months ago

https://docs.github.com/en/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/syncing-your-branch-in-github-desktop

referred to this link... the process is truly tedious... there are no shortcuts. They just recommended to use text editor when editing the information.