linux-next tree correct working

Belisko Marek marek.belisko at gmail.com
Wed Jul 22 10:59:16 UTC 2009


On Wed, Jul 22, 2009 at 12:03 PM, Jiri Slaby<jirislaby at gmail.com> wrote:
> On 07/22/2009 12:00 PM, Belisko Marek wrote:
>> I try clone it yesterday and today update with git pull but get many conflicts.
>>
>> Should I use git pull or git remote update for updating local tree?
>
> You may rebase on the top of each day -next.
>
> Something like
> remote update
> rebase origin/master my_branch
>
> where origin is -next remote branch. my_branch is your branch with the
> changes.
I follow your proposals but:


Switched to a new branch "my_branch"
marek.nandra at linux-nandra:~/kernel/linux-next> git-rebase
origin/master my_branch
First, rewinding head to replay your work on top of it...
Applying mtd: blkdevs: do not for get to get MTD devices
Applying Staging: hv: remove ULONG and LONG typedefs
error: patch failed: drivers/staging/hv/StorVsc.c:62
error: drivers/staging/hv/StorVsc.c: patch does not apply
error: patch failed: drivers/staging/hv/include/StorVscApi.h:117
error: drivers/staging/hv/include/StorVscApi.h: patch does not apply
error: patch failed: drivers/staging/hv/include/osd.h:95
error: drivers/staging/hv/include/osd.h: patch does not apply
error: patch failed: drivers/staging/hv/include/vstorage.h:155
error: drivers/staging/hv/include/vstorage.h: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged drivers/staging/hv/StorVsc.c
CONFLICT (content): Merge conflict in drivers/staging/hv/StorVsc.c
Auto-merged drivers/staging/hv/include/StorVscApi.h
CONFLICT (content): Merge conflict in drivers/staging/hv/include/StorVscApi.h
Auto-merged drivers/staging/hv/include/osd.h
Auto-merged drivers/staging/hv/include/vstorage.h
CONFLICT (content): Merge conflict in drivers/staging/hv/include/vstorage.h
Failed to merge in the changes.
Patch failed at 0002.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


What should I do in this case? Skip?

>

Thanks,

Marek



More information about the devel mailing list