From what I read, both of them help us get a linear history.
From what I experimented, rebase works all the time. But merge --ff-only works only in scenarios where it can be fast forwarded.
Your evaluation license for Confluence has expired. Here's the information you need to continue using Confluence