Files causing merge conflicts, preventing git pull

[trevormunoz]

Travis—

The following files seem to be causing (somewhat intractable) conflicts when people try to pull from master. I can't see anything wrong in the files and I don't have the same conflicts between my local and origin/master. I wonder if you might take a look and see if you can figure out what is screwy?

data/eng738t/tei/ox-ms_abinger_c57-0048.xml data/eng738t/tei/ox-ms_abinger_c57-0059.xml data/eng738t/tei/ox-ms_abinger_c57-0079.xml data/tei/ox/ox-ms_abinger_c56-0019.xml

Trevor

[travisbrown]

I'm also not having any conflicts with these files. Who's having problems, and what branch are they pulling into?

[trevormunoz]

Two people so far. Jessica and Mary (I half expect more to pop up). On their local master pulling from origin master

On Apr 18, 2012, at 9:57 PM, Travis Brownreply@reply.github.com wrote:

I'm also not having any conflicts with these files. Who's having problems, and what branch are they pulling into?

---

Reply to this email directly or view it on GitHub: https://github.com/umd-mith/sg-data/issues/540#issuecomment-5213323

[travisbrown]

Can we have one of them do a quick "git checkout -b whatever", "git commit -a -m 'New branch to check merge problem.'", "git push origin whatever"? Or just "git fetch && git diff master origin/master > diff.txt"? It's hard to debug this if we can't reproduce the problem.

Travis

On Wed, Apr 18, 2012 at 10:31 PM, Trevor Muñoz < reply@reply.github.com

wrote:

Two people so far. Jessica and Mary (I half expect more to pop up). On their local master pulling from origin master

On Apr 18, 2012, at 9:57 PM, Travis Brownreply@reply.github.com wrote:

I'm also not having any conflicts with these files. Who's having problems, and what branch are they pulling into?

---

Reply to this email directly or view it on GitHub: https://github.com/umd-mith/sg-data/issues/540#issuecomment-5213323

---

Reply to this email directly or view it on GitHub: https://github.com/umd-mith/sg-data/issues/540#issuecomment-5213707

[trevormunoz]

@mtclaffey,

Could you run git fetch && git diff master origin/master > diff.txt

Then post the entire contents of that plain text file here and/or send it to Travis and I as an attachment to an email.

Thanks.

On Apr 18, 2012, at 10:47 PM, Travis Brownreply@reply.github.com wrote:

git fetch && git diff master origin/master > diff.txt

[ghost]

@trevormunoz, @travisbrown

Welcome to Git (version 1.7.9-preview20120201)

Run 'git help git' to display the help index. Run 'git help ' to display help for specific commands.

Mary@MARY-LAPTOP ~ $ git fetch && git diff master origin/master > diff.txt fatal: Not a git repository (or any of the parent directories): .git

Mary@MARY-LAPTOP ~ $ cd sg-data

Mary@MARY-LAPTOP ~/sg-data (master) $ git fetch && git diff master origin/master > diff.txt Password for 'https://mtclaffey@github.com':

Mary@MARY-LAPTOP ~/sg-data (master) $

On 04/18/12, Trevor Mu?oz wrote:

@mtclaffey,

Could you run git fetch && git diff master origin/master > diff.txt

Then post the entire contents of that plain text file here and/or send it to Travis and I as an attachment to an email.

Thanks.

On Apr 18, 2012, at 10:47 PM, Travis Brownreply@reply.github.com wrote:

git fetch && git diff master origin/master > diff.txt

---

Reply to this email directly or view it on GitHub: https://github.com/umd-mith/sg-data/issues/540#issuecomment-5214064

[ghost]

@trevormunoz, @travisbrown

i also checked my status after nothing came up on the last command: Mary@MARY-LAPTOP ~/sg-data (master) $ git status

On branch master

Your branch and 'origin/master' have diverged,

and have 3 and 46 different commit(s) each, respectively.

#

Untracked files:

(use "git add ..." to include in what will be committed)

#

diff.txt

nothing added to commit but untracked files present (use "git add" to track)

[travisbrown]

@trevormunoz, @mtclaffey,

A hard reset is probably the quickest way the wrap this up.

# Make sure you're in master:
git checkout master

# Create a new pointer to the current master in case there's stuff there you want later:
git branch diverged-master

# Reset the current branch (master) to the central master on GitHub:
git reset --hard origin/master

# Push the old master to GitHub so we can debug (optional):
git push origin diverged-master

Does this sound right to you, Trevor?

[travisbrown]

@mtclaffey, @trevormunoz,

Just noticed there was a typo in my last comment: the second line of code should have been:

git branch diverged-master

It's edited now in the GitHub interface, but the email will stay wrong.

[ghost]

@travisbrown, @trevormunoz

Mary@MARY-LAPTOP ~/sg-data (master) $ git reset --hard origin/master HEAD is now at 942064f Fixing merge conflict

Mary@MARY-LAPTOP ~/sg-data (master) $ git push origin diverged-master Password for 'https://mtclaffey@github.com': Total 0 (delta 0), reused 0 (delta 0) To https://mtclaffey@github.com/umd-mith/sg-data.git

• [new branch] diverged-master -> diverged-master

Mary@MARY-LAPTOP ~/sg-data (master) $

[ghost]

@trevormunoz @travisbrown

It looks like it took care of the commit problem, but I have this untracked file now. Is that a problem?

Mary@MARY-LAPTOP ~/sg-data (master) $ git status

On branch master

Untracked files:

(use "git add ..." to include in what will be committed)

#

diff.txt

nothing added to commit but untracked files present (use "git add" to track)

Mary@MARY-LAPTOP ~/sg-data (master) $

[travisbrown]

@mtclaffey,

No, you can either delete it or make a tmp directory in the project base directory (sg-data) and move it there, where Git won't complain about it.

[ghost]

so would that be: git branch -d diff.txt

? I've haven't deleted anything yet...

[travisbrown]

@mtclaffey,

Since the file isn't tracked by Git, you can just do a normal file system delete (right-click remove, etc.).

If you wanted to remove a file that Git was tracking, you could use the following:

git rm diff.txt

But that's not necessary (and won't work) here.

[ghost]

@travisbrown I'm all set Travis. Thank you.

Mary

[cwulfman]

Just reporting: I encountered the same conflict today (not yesterday, oddly). Performing the hard reset as suggested seems to have solved the problem.