title: Sync feature branch with master without rebase?
body: <p>At work we develop on top of a feature branch model where all integrations end up in the <code>master</code> branch eventually. We branch from <code>master</code> and <strong>merge</strong> to <code>master</code>. This results in a very complex history graph and we are looking at ways to simplify our development workflow.</p>
  
  <p>One way of doing so it to <strong>rebase</strong> instead of <strong>merge</strong>. However, we have an internal GitLab instance installed where overwrite permissions are disabled (and they are not going to be enabled for our project only). As such <strong>rebase</strong> is out of the question.</p>
  
  <p>I honestly don't see any way around this. But I'm no Git expert and I might be missing something.</p>
  
  <p>Any suggestions?</p>