Questions tagged [diff]
The act of identifying differences between two or more files in order to support various software development activities (bug tracking, patch creation, ...)
diff
4,661
questions
0
votes
0
answers
26
views
Revert line by line in VS Code diff / compare files
VS Code has a very useful diff tool for comparing files (e.g. through the select file -> compare with selected dialogs). I really like this tool and use it a lot, but often wish that I could "...
- 524
1
vote
0
answers
20
views
How to avoid --unsafe-paths with "git apply" outside a repository?
I'm trying to apply a patch generated using git diff from two similar trees. None of the two trees are in a git repo. It only works if I pass --unsafe-paths to git apply (the diffs can contain renamed ...
- 806
2
votes
2
answers
75
views
make diff ignore case of umlauts
I need to make diff ignore the case of my inputs. Both inputs contain German umlauts like ä and Ä. Option -i successfully makes diff ignore the case of my input for other characters like a and A, ...
- 58.5k
0
votes
0
answers
36
views
How do I generate a diff between a file and an incomplete patch of it
I'm working on a project that requires me build an interface between an LLM and the user. The LLM is used for code fix generation and I need to output the diff between the generated code and the ...
0
votes
1
answer
61
views
Git shows modified files with no actual differences
I'm working on a large and complex corporate project and I'm encountering an issue with Git and Visual Studio solution files (.sln). I have two .sln files that Git identifies as completely edited, but ...
0
votes
0
answers
46
views
How to compare files from .war file with a branch
I need to compare a .war file (it's like a compressed file with all file project on it) with a master branch.
I have a script to compare 2 branches, I need to compare a file (or folders btw) with my ...
0
votes
1
answer
44
views
How to compare a file on a local Git branch with its equivalent on a remote branch
I have found a number of posts which show how one can perform a diff between a local and a remote branch. However, I would like to do that for just a single file.
I was using the answers given in [how-...
- 999
1
vote
0
answers
34
views
git diff a file against the multiple files it was split into
I have a file A on branch old_branch that exists as multiple files A, B, C on a different branch new_branch. I need to merge old_branch into new_branch which would require me to resolve the merge ...
- 56
1
vote
1
answer
90
views
Diff viewer for YAML files
I want to compare YAML semantically rather than line by line.
Would be great to integrate it in IntelliJ and get a visual representation.
I found several online tools like https://www.yamldiff.com/ ...
- 151
0
votes
1
answer
29
views
patch: do not remove empty ancestor directories
I need to merge changes between directories into a third directory. I am using patch to merge the files and a custom script to merge the empty directories (mkdir/rmdir). Unfortunately patch will ...
- 1,967
1
vote
2
answers
37
views
How to compare different potential merge results?
I have a feature branch feature/foo and a development branch develop I want to merge the feature to.
I already did a code review at a later point. Now further changes have been pushed to feature/foo. ...
- 591
4
votes
3
answers
111
views
Smarter way to create diff between two pandas dataframes?
I have two pandas dataframes which represent a directory structure with file hashes like
import pandas as pd
dir_old = pd.DataFrame([
{"Filepath": "dir1/file1", "Hash&...
- 11.5k
-3
votes
1
answer
55
views
Visualization of Bitwise Difference of Audio Files
In Linux, I need to visualize the bitwise difference between two audio files (left and right channel), in a way so that I can understand (approximately) when they are identical, and when they are ...
- 802
0
votes
0
answers
26
views
What is the algorithm for selecting the lines to show in a diff patch?
If I have two files, I've used the myer's distance algorithm to find the insert/del/equal lines between the two files.
I'd like to chunk the lines in the similar manner that git diffs produce. So no ...
- 4,717
0
votes
0
answers
30
views
Calculate Hours Difference between two dates fields in Azure DevOps (ADO)
I need to set escalation mechanism for few SLA in my organization using ADO for the tasks created in ADO. I have two date fields, once is start date and other is end date (both of them are mandatory ...
