From: Jay Vee <jvsrvcs@gmail.com>
To: git@vger.kernel.org
Subject: git pull - reporting that I modified files, but I did not
Date: Thu, 17 Jan 2013 12:29:07 -0700 [thread overview]
Message-ID: <CADq_mb-k8mP6PAsPciYEkx6fvFNdGK+ejsFEZ4nCJVcUQ6odGg@mail.gmail.com> (raw)
When I do a git pull, I am getting a messages that changes to local
files would be overwritten by a merge, but I have not changed these
files locally at all, I have not opened them in my IDE.
This happens every now and then.
1) Why does this happen?
2) How do I prevent this from happening in the future?
3) How do I get out of this state so that I can do a git pull and
rebuild my code?
---
In other instances, when I do a git pull (not getting the message
above, I will see something like:
M src/MyClass.java <= a file that I did not touch or modify
D src/AnotherClass.java <= a file that I did not delete or touch
M src/MyModifiedClass.java <= a file that I indeed modified for
which in the pull there are no merge conflicts.
and the pull is successful, (then I want to push my changes), but I
did not change either of the above two files
If I see the above, am I OK to push? My thinking is that git thinks I
changed 'src/MyClass.java' and if I do a diff there are differences,
but I do not want to push because I NEVER TOUCHED THAT FILE IN ANY
WAY.
What is going on here? Maybe this is normal and I simply do not
understand correctly.
What is happening? I would expect to see only line items 'M' and 'D'
for files that I personally have modified and deleted.
If I push at this point, will I overwrite changes in the repo pushed
by others and muck things up?
thanks
J.V.
next reply other threads:[~2013-01-17 19:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-17 19:29 Jay Vee [this message]
2013-01-17 22:59 ` git pull - reporting that I modified files, but I did not Max Horn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADq_mb-k8mP6PAsPciYEkx6fvFNdGK+ejsFEZ4nCJVcUQ6odGg@mail.gmail.com \
--to=jvsrvcs@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).