[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] Did I resolve this git issue correctly?
From: |
Greg Chicares |
Subject: |
Re: [lmi] Did I resolve this git issue correctly? |
Date: |
Wed, 7 Dec 2016 20:56:26 +0000 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 |
On 2016-12-07 14:09, Vadim Zeitlin wrote:
> On Wed, 7 Dec 2016 10:23:49 +0000 Greg Chicares <address@hidden> wrote:
>
> GC> I don't see where this did any harm, but did I handle it in the best way?
>
> You indeed didn't do any harm, but many people, me included, think that
> this is not the best way to do things.
I should have asked first. Now I have a new question, so let me ask first,
before I try to resolve it.
'git status' shows I'm up to date except for this:
Untracked files:
(use "git add <file>..." to include in what will be committed)
.rate_table.cpp.swp
At first I thought it might be a git file that could contain something
important, as 'rate_table.cpp' was indeed part of the merge I did above;
but 'file' says it's not:
/opt/lmi/src/lmi[0]$file .rate_table.cpp.swp
.rate_table.cpp.swp: Vim swap file, version 7.3
Would it be a mistake if, in reliance on 'file', I ignore the '.swp' file
as being some vim artifact that has nothing to do with git?