On Thu, Apr 30, 2015 at 10:23 AM, 'Terry Brown' via leo-editor < [email protected]> wrote:
In the general case of handling a merge conflict you should edit the > file manually and select pieces, then use `git add <filename>` to > indicate the working copy is the copy with resolved conflicts. > > [snip] > > > git checkout --theirs leo/core/commit_timestamp.json > (https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/) > Thanks! I just realized that file completion *does *work, both on Linux and Windows. On Linux, I must use the *forward *slash character as the directory separator as usual. On Windows, I must use the forward slash character when using the git bash shell (recommended) or the *back *slash when using a regular Windows shell. So this is good. It's becoming easier to use the terminal. As another tip, the following will open the global config file (~/.gitconfig) using the editor in effect:: git config --global -e This is a good way to test the editor setting. On Windows, ~/.gitconfig specifies the editor as:: editor = c:/bin/scite.bat where scite.bat is: "C:/Program Files (x86)/SciTE/scite.exe" %* Again, this batch file *must* use forward slashes if it is used by git. The only drawback to using the git bash shell is that Windows .bat files aren't recognized. Sigh. I am going on about this because using the git console may encourage me to do more development work on Linux. EKR -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
