[fpc-devel] Submitting patches using git
denisgolovan
denisgolovan at yandex.ru
Sat Jul 20 21:01:01 CEST 2019
> I tried doing "git rebase origin/master” on the feature branch BEFORE I merged the master but it says "Current branch gen-const-new is up to date.”. What is rebase doing that it thinks the feature branch is up to date?
Generally it means all your feature branch commits are on top of origin/master.
It's a bit difficult to explain via text.
Try doing "git log --graph" before and after doing rebase and you will see it changes in feature branch to be moved (or rebased) after origin/master last commit in your feature branch.
-- Regards,
Denis Golovan
More information about the fpc-devel
mailing list