+ 9d1d11d.8bcfe39 akpm-base -> origin/akpm-base (forced update)ģ7504a3b.8ba4caf stable -> origin/stable + 76c2c6d.4d046e9 master -> origin/master (forced update) Resolving deltas: 100% (2756/2756), completed with 867 local objects.įrom git:///pub/scm/linux/kernel/git/next/linux-next Nothing to commit, working directory clean Your branch is up-to-date with 'origin/master'. However merge conflicts appeared and I don't understand why because I haven't made any change into cloned repo. I've cloned a repo and then, after a few hours, I've made 'git pull'.
0 kommentar(er)
