Git merge 2 new file with removed content and added content

Posted by Loïc Faure-Lacroix on Stack Overflow See other posts from Stack Overflow or by Loïc Faure-Lacroix
Published on 2012-10-02T09:35:06Z Indexed on 2012/10/02 9:37 UTC
Read the original article Hit count: 253

Filed under:

git-merge

So we are working in with 2 different repositories and both designers modified the same file.

the problem is quite simple but I have no ideas how to solve it yet. Both files are marked as new since they have almost nothing in common except that file.

When I try to merge from branch A to B it mark the parts added in A deleted in B and on the other side, what was added in B appears deleted in A.

git seems to try to outsmart me when I know that I need almost every changes and nothing should be mark as deletion.

I have 2 other branch that should merge without problem after these 2 branch. I can't merge them yet since there are some recent changes that may not merge really well too.

I have to merge A and B => E then C and D => F and then hopefully E and F

So the big question here is how can I do a completely manual merge that will mark every changes as conflict anything deleted anything added should be marked as conflict that I can solve by myself using an editor.

Git is trying to outsmart me and fail terribly at it.

Related posts about git-merge

How Do I 'git fetch' and 'git merge' from a Remote Tracking Branch (like 'git pull')

as seen on Stack Overflow - Search for 'Stack Overflow'
I have set up some remote tracking branches in git, but I never seem to be able to merge them into the local branch once I have updated them with 'git fetch'. For example, suppose I have remote branch called 'an-other-branch'. I set that up locally as a tracking branch using git branch --track an-other-branch… >>> More
TeamCity and pending Git merge branch commit keeps build with failed tests

as seen on Stack Overflow - Search for 'Stack Overflow'
We use TeamCity for continuous integration and Git for source control. Generally it works pretty well - convenient, modern and good us quick feedback when tests fails. There is a strange behavior related to Git merge specifics. Here are steps of the case: First developer pulls from master repo… >>> More
git merge should ignore one directory

as seen on Stack Overflow - Search for 'Stack Overflow'
I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch… >>> More
Git merge command

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm reading the following article: http://github.com/guides/keeping-a-git-fork-in-sync-with-the-forked-repo, where they mention essentially pulling in changes from two repos at the same time by creating the following alias: pu = !"git fetch origin -v; git fetch wycats -v; git merge wycats/master" This… >>> More
Git merge of same and externally modified file

as seen on Stack Overflow - Search for 'Stack Overflow'
I have inherited some code (from zip file) from a developer and git initialzed, made changes and set of check-ins progressively. Now, the same developer released the same code with his changes and gave me the another zip file. How do i merge my changes which i have it my git repo and his recent… >>> More

Developer IT