Skip to content

Instantly share code, notes, and snippets.

@dually8

dually8/handling-merge-conflicts.md

Created August 22, 2022 15:01
Show Gist options
  • Save dually8/135dec9e8ac1f13b38109bb2b53651ff to your computer and use it in GitHub Desktop.
Save dually8/135dec9e8ac1f13b38109bb2b53651ff to your computer and use it in GitHub Desktop.
Download ZIP
Handling Merge Conflicts
Raw
handling-merge-conflicts.md

Pre-commit/push script for projects that use Node

npm run build && npm run test && npm run e2e

Set your default formatter in VSCode

press shift+ctrl+p or shift+cmd+p to bring up the command palette in VSCode, then search for "Format Document With" format-document-with use-typescript-language-features

Best way to handle merge conflicts

Use a jetbrains IDE, such as IntelliJ, WebStorm, or Rider. Open the folder in it, then press the blue arrow (maybe a different color depending on your theme. jetbrains-pull

You can use the merge tool from there to see a 3 pane view of the Incoming Code, Resulting Code, and Your Current Code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment