On Sun, Dec 13, 2015 at 07:23:17PM +, brian m. carlson wrote:
> On Mon, Dec 14, 2015 at 12:03:18AM +0530, Rohit Gupta wrote:
> > Thanks brian. I understood my mistake in understanding the working of git
> > merge.
> > But isn't it wrong? As after merging, branch's logic can't work. How to get
On Sun, Dec 13, 2015 at 05:55:59PM +, rohit gupta wrote:
> Hi,
> I am confused with git merge working.
>
> Suppose I have these 3 files in master branch-
> a.txt
> b.txt
> d.txt
>
> I create a branch, add c.txt to it and commit. So its final contents
> are-
> a.txt
> b.txt
> c.txt
> d.txt
>
[Please don't top-post.]
On Mon, Dec 14, 2015 at 12:03:18AM +0530, Rohit Gupta wrote:
> Thanks brian. I understood my mistake in understanding the working of git
> merge.
> But isn't it wrong? As after merging, branch's logic can't work. How to get
> that right then ?
If you know that the merge
Hi,
I am confused with git merge working.
Suppose I have these 3 files in master branch-
a.txt
b.txt
d.txt
I create a branch, add c.txt to it and commit. So its final contents
are-
a.txt
b.txt
c.txt
d.txt
Then, I checkout master branch, delete a.txt, add e.txt and commit. So
final contents
4 matches
Mail list logo
