Yeah, it basically tells you which part is the local branch and which part is the master ... You have to manually decide and knit the conflicting lines together. Then you have to git add the file you worked on and git rebase --continue.