I'm quite new at GIT but I understood the basics pretty well. However, I'm feeling confused...
We're using github, and my branch was 13 ahead and 20 behind the master branch (so quite out of date).
I did the following:
git checkout myBranch
git rebase master
I seem to have merged the same files repeatedly for some reason.
I guess it's because I am applying my changes to each of different versions that were commited on the master branch?
This took quite a while, and when I was finished I assumed I could then just push my (now hopefully up to date) branch back to github. But it tells me I have non fast forward changes - which I don't understand...
So then I do a pull, and git tells me I have to merge all the same files again...
I must be missing something fundamental in my understanding of what's happening here.