[fpc-devel] Submitting patches using git

Ryan Joseph genericptr at gmail.com
Sat Jul 20 19:57:13 CEST 2019



> On Jul 20, 2019, at 1:04 PM, Jonas Maebe <jonas at freepascal.org> wrote:
> 
> You can rebase your feature branch on latest trunk/master instead of
> merging. I think that may even work after you have previously merged it
> (and it should get rid of all merge commits).

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?

Regards,
	Ryan Joseph



More information about the fpc-devel mailing list