Skip to content

Instantly share code, notes, and snippets.

@lrazovic

lrazovic/resolve-conflict.md

Created January 7, 2022 13:53
Show Gist options
  • Save lrazovic/722171f2347ea20914c5aad2269d1306 to your computer and use it in GitHub Desktop.
Save lrazovic/722171f2347ea20914c5aad2269d1306 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
resolve-conflict.md

The easiest way to solve conflict

A stupid method that should not be used to solve conflicts, but it works.

  1. Move the current view folder to another folder, such as Desktop.
  2. Clone the repository again into a new, empty folder.
  3. Enter in development branch
  4. Move the view folder you saved earlier to where the new cloned view folder is, overwrite all the files in the view folder.
  5. Now you can commit and push your changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment