How its possible do something like git diff second_branch -- shared_file
for merge?
Another words , how merge exactly one file from different branches?
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To post to this group, send email t
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
>
> The simple answer: you can't really modify origin/master locally.
>
>
> Jeffrey
>
> --
Thank you.
--
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 fro
Konstantin Khomoutov :
>
> In other words, that "origin/master" is "local" only in the sense
> that it is physically present on your machine, but it is not "local"
> in the sense that you can modify it.
> It is a "reference" branch, if you prefer.
> Really local branches are those you fork m
In svn i can do svn merge -r2352:2359 svn:///trunk
Is it possible do something like this in git?
--~--~-~--~~~---~--~~
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
