I'm looking for a view that highlights changes to files, similar to the changes you can see viewing the Edits button for an SO item, or the history of a wiki page.
For example https://github.com/clojure/clojure/commit/c89bf2e9bcfc1bca62e36dee2d78a48f8c38c15c
You are looking for 'diffs' aka 'changesets'.
Note: the change set view not only offer a diff (line by line or side-by-side), it now (Sept. 4th 2014) offer a word-by-word diff.
See:
"Better Word Highlighting in Diffs"
Commits, compare views, and pull requests now highlight individual changed words instead of the entire changed section, making it easier for you to see exactly what’s been added or removed.
See also comparing commits across time.
Related
I'm editting my GitHub readme and I need to add text in two different alignments. Part of the readme is in English and should be left to right and another part is in a different language (Persian, in my case) which has a right to left alignment. Since GitHub editor does not have any setting to change the text alignment, I wonder if there's any other way to do this?
I've already tried HTML tags like <div dir="rtl">متن فارسی</div> to change the alignment but it doesn't work.
Desired output:
Edit
After getting feedback from #Quentin, I realized that the problem was that when you go to the Preview tab, you cannot see the changes, however, once you Commit, changes will be applied. So, <div dir="rtl">متن فارسی</div> does work, the only thing is that you will see changes after the commit, not in preview tab.
This input which has 2 separate DIV's with one empty line after the last line of the first DIV:
Will be rendered to:
For a quick fix, I've just realized that <p align="right">text</p> works, but a lot of variations with divs and style within the tag did not.
Update Jan. 2022: GitHub editor supports RtL.
Original answer (Q1 2020)
This is followed by dear-github/dear-github issue 275
I think this support is also needed in markdown files, especially in ReadMe files.
Adding such support is very easy: just allow to add a tag "dir='rtl'" at the beginning of a document, and then wrap the entire document inside a "div dir='rtl'".
Also today it is possible to put all text inside a "div dir='rtl'", but then it is not possible to use markdown inside.
So this is not yet supported (at least in the preview, as mentioned by the OP).
It seems to be applied once committed, as tested by Quentin.
There is a discussion on Mardown/Commonmark RTL support.
We currently have a simple Star Team setup with a couple of branches or views as they seem to be refered to in Star Team:
--Production
--Staging
--Development
--Trunk
We would like to "Share" or create a "Referenced View" of a Change Request (CR) that would be visbile on all of these views, but we would like it to be updated across all the branches when a change is made to it.
I have tried Ctrl + dragging and dropping the CR to the various views but they dont get updated when I make changes to it. Its as if they are being treated as individual copies of the CR. I also tried checking and unchecking the "Branch on Change" checkbox for the behavior of each of the items but that seems to have no effect either.
Have you tried the "Floating" Radio Button under "Advanced | Behavior" on the "Configuraion" Tab?
Georg
Does anyone know UI tool (Eclipse plugin would be great, but any other, for Linux/Windows is acceptable) that allows to see difference of some part of code, but also allows switch between revisions quickly, e.g. by using slider.
I like the Team -> Show Annotation... functionality. It colors the left side of the editor and groups changed lines by color. When you hover over one section you get the commit details (revision/author/date/comment).
I've used SVN time lapse view with some success.
http://code.google.com/p/svn-time-lapse-view/
It would be nice if Tortoise SVN blame included this history slider feature.
Previously I've used command line SVN without any wrappers.
Few days ago I switched to Eclipse with Subversive and have problems with diffs.
Team Sync perspective with Compare view is OK, but it displays whole file, not just changes.
Where I can find something similar to "svn diff" output? I need only changes.
Eclipse Compare views show the entire file which makes sense, as its a GUI. In the Compare view, there are buttons in the top right that enable you to skip from diff to diff (down and up), and the right-hand margin shows locations. So, while its not exactly the same as the command-line, its just as functional. Also, it gives you context for the changes, not just the changed line.
If you need to output a report, that's a little different. You might be able to just click int the top pane, type Ctl-A to select all, Ctl-C to copy, and then paste into a text editor. That might give you just the changes.
Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file merge, not folder), it seems that I can only overwrite the right with the left. Is it possible to make WinMerge copy the left to the right, and keep the right?
Check out KDiff3... best free three-way merge tool out there.
No, but you can type on the right side and also copy and paste from the left side to the right side.
I think you're looking for Merge capability. I've seen it in TortoiseMerge but not in WinMerge (though there may be some way to do it). Can you simply copy-and-paste manually from one side to the other?
Diffuse does a marvelous job of that. Don't know what Greg is talking about.
http://diffuse.sourceforge.net/
I had the same problem and found that Guiffy cand merge changes from both file A and file B.
There's a button where you can apply this kind of merging to all the differences.
Check this help page to find out how to keep both changes.
Although not free, you can use it for free for 21 days.
More than enough for my one time need.
I had this problem, but I found out that one of the files (the one of the left) was Read-only. This meant I couldn't copy anything from right to left.
From the File menu, there are options to disable or enable Read-only attribute of either file. Have them both unchecked will allow you to copy in either direction.
What Andrew said is actually quite helpful. I can't imagine that the desired functionality not be in WinMerge, but if not, copy left and right all that you can normally, then manually copy/paste the rest to get both sides identical how you want them. You can refresh after making these manual changes to see the status.
Yes, you need to go into the file comparison window (by double-clicking on an entry in the folder comparison window) which will show groups of differences (lines in the files). In this window, you can move stuff between left and right any way you want, using the toolbar buttons or keys (Alt-Left, Alt-Right, Alt-Up, Alt-Down).
The simple answer is no - you're almost asking it to read your mind. Instead, WinMerge opens both files up in a full text editor, and it illustrates the discrepancies while you do the copy and pasting.
Late to the party, but I just ran into this problem.
I'm using WinMerge 2.16.18.0. On the Select Files or Folders panel, there is a checkbox under each file/folder section that allows that file/folder to be treated as read-only. I unknowingly had that checkbox set as it is easy to miss.