I've been struggling a bit with the workflow and I think I see what I'm doing wrong now but wanted to confirm.
I've been running the following to keep my fork up to date: git checkout master git fetch upstream git merge upstream/master git push origin And then to update my branch I have been doing: git checkout ARROW-nnnn git merge master git push origin This generally has worked but sometimes I seem to pick up random commits on my branch. Reading the github fork workflow docs again it looks like I should have been running "git rebase master" instead of "git merge master" ? Is that the only mistake I'm making? Thanks, Andy.
