Subject: Re: [git-users] Merge conflict error, when there was no change in
mentioned file
Hi Philip,,
This is an area of interest to me, any headway on this?
I would suggest some extra output be added about *why* files conflict when
"git-merge" is run with -v
In the
Hi Philip,,
This is an area of interest to me, any headway on this?
I would suggest some extra output be added about *why* files conflict when
"git-merge" is run with -v
In the past I noticed not much difference between "-q, [nooption], and -v"
in the output.
--
Quentin
On Sunday, May 17,
it would.
Philip
- Original Message -
From: Konrád Lőrinczi
To: git-users@googlegroups.com
Cc: philipoak...@iee.org ; klorin...@gmail.com
Sent: Saturday, May 16, 2015 3:42 PM
Subject: Re: [git-users] Merge conflict error, when there was no change in
mentioned file
:* Konrád Lőrinczi
*To:* git-...@googlegroups.com
*Sent:* Saturday, May 16, 2015 1:03 PM
*Subject:* [git-users] Merge conflict error, when there was no change in
mentioned file
I have a site local repo and a remote repo.
Local repo contains the 1-2 month old content of remote repo.
I
Philip Oakley philipoak...@iee.org writes:
You may find that there are 'end of line' differences between the
commits in the server, and the commits you have locally, which after
eol conversion, look identical, but the different eol strings makes
the sha1's different.
Yes, it's usually the
I checked line endings in Notepad++ and both were unix.
Unfortunately I can not reproduce the problem anymore, as when I fixed the
problem I stepped to the next development problem.
sha1 compare and binary check are good idea for next time.
Thanks your help ideas anyway,
Konrad
2015.
From: Dale R. Worley wor...@alum.mit.edu
Philip Oakley philipoak...@iee.org writes:
You may find that there are 'end of line' differences between the
commits in the server, and the commits you have locally, which after
eol conversion, look identical, but the different eol strings makes
the
I have a site local repo and a remote repo.
Local repo contains the 1-2 month old content of remote repo.
I try to pull the whole content into local repo.
git pull origin master
From ssh://.../site.git
* branchmaster - FETCH_HEAD
...
CONFLICT (add/add):
From: Konrád Lőrinczi
To: git-users@googlegroups.com
Sent: Saturday, May 16, 2015 1:03 PM
Subject: [git-users] Merge conflict error, when there was no change in
mentioned file
I have a site local repo and a remote repo.
Local repo contains the 1-2 month old content of remote repo
