Context-aware merge?
Semantic Merge. Languages supported, from the website: We started with C# and Vb.net, then added Java. Now C is already supported and then we’ll focus on C++, Objective-C and JavaScript, depending on your feedback
diff
Compare two files ignoring order
Sort the files first: $ sort file1 > file1.sorted $ sort file2 | diff – file1.sorted Also, although I personally discourage this sort of thing, if you are using bash and this feature is enabled on your system you can avoid the temporary file by using a process substitution: $ diff <(sort file1) <(sort file2)
Why doesn’t `git diff` invoke external diff tool?
I get the in-terminal diff display. I this should not happen, because I have set up an external diff tool Yes, it should: diff.external is for “in-terminal diff display”. (from git config man page) diff.external If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given … Read more
How can I disable diff in line separators in IntelliJ IDEA?
In the bottom right of your window, change [CRLF] to [LF]
Generate pretty diff html in Python
There’s diff_prettyHtml() in the diff-match-patch library from Google.
How to grep (search through) committed code in the Git history
To search for commit content (i.e., actual lines of source, as opposed to commit messages and the like), you need to do: git grep <regexp> $(git rev-list –all) git rev-list –all | xargs git grep <expression> will work if you run into an “Argument list too long” error. If you want to limit the search … Read more
IntelliJ Diff Tool in SourceTree
For OSX android studio i’ve accomplished with this steps: Open IntelliJ/Android Studio -> Tools -> Create Command Line Launcher After that, open SourceTree Preferences: and put “/usr/local/bin/studio” in Diff/Merge Command. Like this: Diff Arguments: diff $LOCAL $PWD/$REMOTE Merge Arguments: merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED And if everything it’s ok it should work.
Can SourceTree show diff side-by-side
No, I really hope to see that feature in some of the future releases.
How does the github website work (architecture)? [closed]
The core of Github is the open-source software git, which is a distributed version control and source code management software. Github adds many features onto git‘s functionality, including issue tracking, wiki, access control, etc. However, Github is proprietary software, and many of it’s internals remain unknown to general public. In order to find out how … Read more
Computing np.diff in Pandas after using groupby leads to unexpected result
Nice easy to reproduce example!! more questions should be like this! Just pass a lambda to transform (this is tantamount to passing afuncton object, e.g. np.diff (or Series.diff) directly. So this equivalent to data1/data2 In [32]: data3[‘diffs’] = data3.groupby(‘ticker’)[‘value’].transform(Series.diff) In [34]: data3.sort_index(inplace=True) In [25]: data3 Out[25]: date ticker value diffs 0 2013-10-03 ticker_2 0.435995 0.015627 … Read more