[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Stupid git!
|
From: |
Dmitry Gutov |
|
Subject: |
Re: Stupid git! |
|
Date: |
Sat, 12 Sep 2015 23:43:43 +0300 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:40.0) Gecko/20100101 Thunderbird/40.0 |
On 09/12/2015 11:36 PM, Alan Mackenzie wrote:
I just did `git pull'. This didn't merge the upstream changes into
my repository. Instead it put the upstream file change into my working
directory, discarding the other contributer's change log. If I
understand correctly, that is.
What does 'git status' say?
I think the best thing for me to do now is `git checkout <file>' to
revert that changed file,
If you're in the middle of a merge, it's a recipe for disaster.
- Re: Stupid git!, (continued)
- Re: Stupid git!, David Kastrup, 2015/09/12
- Re: Stupid git!, Giuseppe Scrivano, 2015/09/12
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!, Andreas Schwab, 2015/09/12
- Re: Stupid git!, Eli Zaretskii, 2015/09/12
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!,
Dmitry Gutov <=
- Re: Stupid git!, Alan Mackenzie, 2015/09/12
- Re: Stupid git!, Sven Axelsson, 2015/09/13
- Re: Stupid git!, Alan Mackenzie, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14
- Re: Stupid git!, Eli Zaretskii, 2015/09/14
- Re: Stupid git!, David Kastrup, 2015/09/14