1

I tried to go with git rebase being on some feature-branch, applying master branch on it (well rebassing ON master), wich was way ahead that future branch. (master has more new commits than feature branch)

So,

git branch  : feature-branch
git rebase master
[resolving conflicts]
git rebase --continue
[resolving conflicts]
git rebase --continue
git push -f origin feature-branch

Then I created a PR (Pull Request) to upstream and in the changes list (still) see conflicts between upstream and origin!

Why is that?

Is there some setting, like git-config i should tune?

--

For smaller bunch of code I never had that issue.

ses
  • 13,174
  • 31
  • 123
  • 226

1 Answers1

1

I suspect your local master branch may not be up to date with origin/master.

Did try 'git rebase origin/master'?

whaleberg
  • 2,093
  • 22
  • 26
  • the master is up to date. that was my first thought too. I did remove it from origin and re-created again from scratch 'git co -b master upstream/master' then set to 'git branch --set-upstream-to=origin' so then with 'git branch -vv' I saw proper set for it. – ses Nov 15 '15 at 00:48