Help! I get all these merge conflicts!
How to fix the tree after a rebase.
After a kernel rebase you will experience a merge conflict. This is because the old master has been deleted/moved in favor of a re-done master that has a base off of a newer kernel version. On zen-stable, this will happen on major bumps - for example, 2.6.31->2.6.32, you can still use the 2.6.31 version on the master-2.6.31 branch, but the newest version is always kept on the master branch.
They may *look* frightening, but they are no big deal and they are a simple fix.
Here's an example of a merge conflict:
host@host # git pull
Auto-merged .gitignore
Auto-merged MAINTAINERS
Auto-merged Makefile
CONFLICT (content): Merge conflict in Makefile
Removed arch/mips/lasat/sysctl.h
Auto-merged drivers/ata/libata-scsi.c
Auto-merged drivers/char/Kconfig
Auto-merged drivers/char/drm/ati_pcigart.c
Auto-merged drivers/char/drm/drm.h
Auto-merged drivers/char/drm/drm_drv.c
CONFLICT (content): Merge conflict in drivers/char/drm/drm_drv.c
...
Automatic merge failed; fix conflicts and then commit the result.
The typical way to fix it can be summarized in one line, although you should really learn what each of the git commands does.
host@host # git add .; git reset --hard; git branch -M master master-old; git checkout -b master origin/master; git branch -D master-old
Now all the conflicts should be resolved and you are on the fresh master
Forgot your password?
New user?
