Merge conflict

Roger H Newell newell.roger at
Sun Feb 14 18:51:40 EST 2016

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> wrote:
> Hi,
> Some days ago i followed the tips:
> git clone greg's git tree and built branch first-patch.
> Due to my first patch that fixes coding style reported
> by 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
-------------- next part --------------
An HTML attachment was scrubbed...

More information about the Kernelnewbies mailing list