I have a local branch of a project (“configUpdate”) that I’ve forked from somebody else’s project and I’ve done a load of changes on it and would like to merge the changes they’ve made in to my local branch.
I’ve tried
git pull --rebase origin configUpdate
but it hasn’t grabbed the latest changes – how can I merge the two? (also for bonus points what did I do with the pull --rebase command?)
