Sounds like you want these two commands:

git checkout --ours dir1
git checkout --theirs dir2

If branch A added some files in dir2 and branch B added some in dir1,
and you want to get rid of those, you'd want to remove them first
(perhaps even just remove the entire directories before doing the
checkouts).

Jeffrey


On Mar 12, 1:47 pm, apm <korja...@gmail.com> wrote:
> I have two branch, very very long wasnt merged.
> And have alot of conflicts.
>
> Mostly conflicts CONFLICT (add/add).
>
> Is it possible (which git command? ) say use for this subdir left side,
> for other dir right side.
>
> for examle
> branchA
> ->dir1
> ->->a
> ->->b
> ->->c
> ->->f
> ->dir2
> ->->a
> ->->b
> ->->c
> ->->x
>
> branchB
> ->dir1
> ->->a
> ->->b
> ->->c
> ->->g
> ->dir2
> ->->a
> ->->b
> ->->c
> ->->z
>
> after merge branchB into branchA i have:
> both added:         dir1/a
> i want forget about all files branchB/dir1 and revert my mergebranch to
> branchA/dir1, and the same but vice verca with dir2, i want have dir2
> from branchB
>
> which command help me "revert" ?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to