I have a Fisheye review that closed in which only certain files were updated. However, when I generated a pull request, there were a lot of extra files which I didn't touch. Why is that?
I tried to rebase my feature branch to a baseline, reinserted my changes, committed my changes, and tried to push to my feature branch on Bitbucket. However I received the following messages:
[rejected] feature branch -> feature branch (non-fast-forward)
error: failed to push some refs to 'repo'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counter. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing sagain.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
The question is, from which remote branch should I pull: my feature branch or the baseline branch? Please advise as I have a time-critical deadline. Thanks.
