Hi all,
Yestoday when I worked using Git, I found a bug. It's about
rebase. Or I don't know if it is a bug, maybe that is Git. Below is my
problem:
There is a master branch, and we develop in our own branch.
Let's simplify this: there are two branches created at the same commit
point
ckout master
$ git merge A
$ git checkout B
$ git rebase master [problem is here, cat README.rd we will get :
hello and git instead of hello world git]
2016-05-13 13:23 GMT+08:00 Pranit Bauva :
> Please mention the version no of git you are using and your system.
> I am answering according to
wrong way ?
Thanks.
2016-05-13 14:37 GMT+08:00 Pranit Bauva :
> On Fri, May 13, 2016 at 11:28 AM, 李本超 wrote:
>> git version 2.6.4 (Apple Git-63)
>> system version: OS X EI Capitan 10.11.4
>>
>> below is the steps:
>> $ mkdir test_repo
>> $ cd test_repo
>> $
git merge A
Updating 9cdb3a8..6f0b0a3
Fast-forward
README.md | 1 +
1 file changed, 1 insertion(+)
$ git checkout B
Switched to branch 'B'
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Modify one line
$ cat README.md
hello
git
$
2016-05-13 15:10 G
Thanks for your explanation
>
> The moment where I think you'd like to be notified is when we skipped
> doing anything with patch 1. You'd prefer it to say "woah, the other
> side of the rebase did the same thing as us".
Actually this is the problem where I want to be notified.
> But rebase does
5 matches
Mail list logo
