From: Junio C Hamano <hidden> Date: 2016-06-15 22:52:42
chirin [off-list ref] writes:
From what I understand, your scenario is exactly what I expect. Which is why
when I asked around my colleagues, no one was able to explain why I'm having
this issue.
As per your scenario:
# A changes hello.txt
# Going into B (who has not done anything to hello.txt)
git pull --> merge conflict on hello.txt
git commit
git pull --> OK
This is quite different from what Dov showed as "the right way to
report". Dob's recipe begins from absolutely empty state and creates three
repositories involved with exact sequence and anybody can reproduce how it
is supposed to work (or break). It was written in such a way that you can
try to follow the sequence to see if you see a behaviour that is different
from Dob expects (in which case your machine, filesystem or the Git binary
you installed might be the culprit). Have you tried it?
Compared to that, your version above does not say anything about what the
state of A, B and the repository A and B interact with were in before the
problem started, so even if Dob wanted to help you by trying to reproduce
your situation, there is not enough information to do so.
quoted
In this sequence, which fulfills the scenario that you described,
there are no conflicts. So I suggest that you try to change the
command sequence to illustrate what you don't understand and ask
again.
The problem was solved by using another Gerrit ID for remote.origin.url in
the config. I remain confused with Git.
Junio C Hamano wrote
Compared to that, your version above does not say anything about what the
state of A, B and the repository A and B interact with were in before the
problem started, so even if Dob wanted to help you by trying to reproduce
your situation, there is not enough information to do so.
My apologies on being vague.. I'm here for learning purpose instead of
get-someone-to-help-me-solve purpose. :P I'm really keen on learning what to
look for, where to start looking to understand Git.
I'm having difficulties providing information that I do not yet know how to,
as I'm still at the stage where I'm studying simple terminologies like
origin, master, etc. and I tend to confuse myself more by comparing it to
SVN.
What should I know about the 'states of A, B and the repository A and B
interact with'?
--
View this message in context: http://git.661346.n2.nabble.com/Git-beginner-Need-help-understanding-tp7129186p7131536.html
Sent from the git mailing list archive at Nabble.com.
I'm glad to hear that your problem was solved.
On Wed, Dec 28, 2011 at 03:38, chirin [off-list ref] wrote:
[stuff deleted]
What should I know about the 'states of A, B and the repository A and B
interact with'?
The state of a repository are most easily described by the sequence of
commands done to it from its creation. The best way of learning and
solving problems is trying to reproduce them with the minimum amount
of steps. I.e. even if you are using a GUI tool for your convenience,
you should be familiar with the command line tools, since that is the
best way of conveying what you have done. My motto is: "Don't describe
in human language what you have done, but show me the exact
commands!". And there is no language better for such than the exact
command line.
Regards,
Dov