![]() There is one caveat, in order to run “git difftool’ or “git mergetool” you have to first run “git diff” or “git merge” and have a difference or conflict. ![]() Git has two commands that will launch the diff/merge editor full screen from the command line, “git difftool” and “git mergetool.” Which ever file comparison editor you use, it needs to be configured in Git so the “git difftool” and “git mergetool” command will bring up the editor with the correct files loaded. The diff/merge is typically done in an editor specifically designed to show files side by side with changes highlighted. Its difficult to rectify any conflicts from the command line, besides a Window GUI is nicer for this type of conflict resolution. The problem with both diff and merge is sometimes there are multiple differences in the files, and changes can be extensive. These conflicts arise when you try to merge two branches together with a “git merge,” or a recent “git pull” from another repository may produce a merge conflict. When more than one developer is working on a project a three way difference may occur between the two developers working on a file, and the previously committed version of a file. To test this out change a file that you already have committed and then run “git diff.” It will look at the same files in each place and show you the differences in the files. ![]() “git diff” shows the difference between what’s in your working directory, what your currently working on, and what’s in your index staged to be committed next, or is already committed. Invariably when working on files, you’ll edit a file, and wonder how it differs from what you’ve previously committed, or staged to commit with a “git add.” You can discover these differences with the “git diff” command.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |