[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] Did I resolve this git issue correctly?
From: |
Vadim Zeitlin |
Subject: |
Re: [lmi] Did I resolve this git issue correctly? |
Date: |
Thu, 8 Dec 2016 01:17:15 +0100 |
On Wed, 7 Dec 2016 21:02:41 +0000 Greg Chicares <address@hidden> wrote:
GC> On 2016-12-07 20:56, Greg Chicares wrote:
GC> [...]
GC> > 'git status' shows I'm up to date except for this:
GC> >
GC> > Untracked files:
GC> > (use "git add <file>..." to include in what will be committed)
GC> > .rate_table.cpp.swp
GC> >
GC> > At first I thought it might be a git file that could contain something
GC> > important, as 'rate_table.cpp' was indeed part of the merge I did above;
GC> > but 'file' says it's not:
GC> >
GC> > /opt/lmi/src/lmi[0]$file .rate_table.cpp.swp
GC> > .rate_table.cpp.swp: Vim swap file, version 7.3
GC> >
GC> > Would it be a mistake if, in reliance on 'file', I ignore the '.swp' file
GC> > as being some vim artifact that has nothing to do with git?
GC>
GC> I found the answer. I forgot that I had 'rate_table.cpp' open in a
GC> vim session elsewhere. I didn't actually want to change that file,
GC> so I did ':q!' and the 'swp' file disappeared.
This is absolutely correct, but just another small piece of advice: if you
use Vim, it's really useful to have ".*.sw?" pattern in your ~/.gitignore.
Having "tags" in it can be useful as well, if you use ctags, which goes
very well together with Vim.
Regards,
VZ