Stuck on an issue?
Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.
And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.
No diff for conflicted files
See original GitHub issueClicking on conflicted files in the source control sidebar does not do anything. At the least, it could open up the file normally where we could perform conflict resolution.
On a related note, the right click options for conflicted files Open changes with BASE/HEAD don’t do anything.
Issue Analytics
- State:
- Created 6 years ago
- Comments:16 (16 by maintainers)
Top Results From Across the Web
What's the simplest way to list conflicted files in Git?
Use git diff, with name-only to show only the names, and diff-filter=U to only include 'Unmerged' files (optionally, relative to show paths ...
Read more >Resolve conflicts with Ours or Theirs for file without opening diff
And now I have to open the diff tool, select the A or B on top and do the save. When there are...
Read more >Resolving a merge conflict using the command line
You can resolve merge conflicts using the command line and a text editor. ... Generate a list of the files affected by the...
Read more >Git merge conflicts | Atlassian Git Tutorial
diff helps find differences between states of a repository/files. This is useful in predicting and preventing merge conflicts.
Read more >Conflict resolution — Introduction to version control with Git ...
Remove the resolution markers, if not already done. The file(s) should now look exactly how you want them. Check status with git status...
Read more >
Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free
Top Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
@johnjacobkenny, Update the
README.mdwith new config optionsYeah, nice first issue. Just need to look at the commands in the package.json and add checks for conflicts. Just reference the external check that are already there.
You will also need to edit the resource.ts and add a check for changes in the
get command()function and return a open file command instead.