Re: [git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

[Magnus Therning]

AD S  writes:

> I am in the process of merging my branch into a remote repo (that
> others contribute to as well).
>
> I get a merge error on a file I have not touched in my branch.
>
> Curious I open the file, expecting to see the merge conflicts
> highlighted, eg: *<<<
> I do not have access to the remote repo on Github so I cannot inspect
> 'their' file to see the differences.

Yes, you do have access to it. Merges are completely local. Always!

> I attempted to `git checkout --theirs file/name` but got an error: unable
> to unlink old 'file/name' (Permission denied)
>
> I attempted to move out of the branch to try and start again but got an
> error saying I had merge conflicts to resolve.
>
> I don't want to `git add` my version of the file, because I can't tell if
> it's correct or not.
>
> What is the best course of action here?

Personally I'd abort the merge (git merge --abort), make sure I check in
any local changes I want to keep (otherwise remove them), and finally
check the differences between my branch and theirs:

- to see what files differ: git diff --name-only 
- to see the full diff: git diff 

I've found it helpful to both be in a nice clean work area, and to have
a good grasp of what's about to be merged, before starting the merge.

/M

--
Magnus Therning  OpenPGP: 0x927912051716CE39
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

But whereas I previously held for Java a cordial dislike borne of
having only a cursory notion of how it worked, now my dislike for the
language can no longer be called at all "cordial", for familiarity has
bred contempt.
 — Tom Christiansen

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

[AD S]

I am in the process of merging my branch into a remote repo (that others 
contribute to as well).

I get a merge error on a file I have not touched in my branch.

Curious I open the file, expecting to see the merge conflicts highlighted, 
eg: *<<