Merge conflict

[YU Bo]

Hi,
I just have checkouted origin/staging-testing and git rebase first-patch.Now,
=============git command && output==============
yubo at debian:~/maintree/staging$ git branch -a
* (no branch)
  first-patch
  staging-next
  staging-testing
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/origin/staging-linus
  remotes/origin/staging-next
  remotes/origin/staging-testing
  remotes/origin/test
ubo at debian:~/maintree/staging$ git fetch origin
remote: Counting objects: 273, done.
remote: Compressing objects: 100% (273/273), done.
remote: Total 273 (delta 160), reused 0 (delta 0)
Receiving objects: 100% (273/273), 298.64 KiB | 196 KiB/s, done.
Resolving deltas: 100% (160/160), done.
From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
   2cdb82c..d9750a2  staging-next -> origin/staging-next
yubo at debian:~/maintree/staging$ git checkout staging-testing 
drivers/gpu/drm/i915/intel_display.c: needs merge
error: you need to resolve your current index first
===============end==================









--
Best Regards


在 2016-02-15 07:51:40，"Roger H Newell" <newell.roger at gmail.com> 写道：


I think you want to have first-patch checked out and rebase origin/staging-testing ? You mite also consider checking out staging-testing first and run git fetch origin.

On Feb 14, 2016 8:17 PM, "YU Bo" <yuzibode at 126.com> wrote:
>
> Hi,
> Some days ago i followed the tips:
> http://kernelnewbies.org/FirstKernelPatch
> git clone greg's git tree and built branch first-patch.
> Due to my first patch that fixes coding style reported
> by checkptch.pl didn't applied,so i intend to rebase my 
> git branch first-patch.The question i encounter is:
> ==================git command && output========
> yubo at debian:~/maintree/staging$  git rebase first-patch
> It looks like git-am is in progress. Cannot rebase.
> yubo at debian:~/maintree/staging$ git am --abort 
> You seem to have moved HEAD since the last 'am' failure.
> Not rewinding to ORIG_HEAD
> yubo at debian:~/maintree/staging$ git rebase first-patch
> First, rewinding head to replay your work on top of it...
> Applying: ovl: default permissions
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> ----
> Auto-merging drivers/gpu/drm/i915/intel_display.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
> Failed to merge in the changes.
> Patch failed at 0010 drm/i915: Only run commit when crtc is active, v2.
>
> Is there  something with wrong?
> Thanks in advance for the noisy.
> --
> Best Regards
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20160215/5c0d9abc/attachment-0001.html