title: Fast-forward, merge commit or merge to working tree, which is the right option to pick here?
body: <p>I have a GIT repository with two branch <code>master</code> and <code>entidades</code>. I need to merge to <code>master</code> branch a few things from <code>entidades</code> branch. Take a look at image, the folder marked <code>EntityBundle</code> is the only thing I need to merge from <code>entidades</code> to <code>master</code>, how I do that? I hit merge on <code>entidades</code> branch at SmartGit and get a message like image shows but here I get lost since I don't know what is the right choice in order to no mess the <code>master</code> repo, can any give me a tip?</p>
  
  <p><img src="https://i.stack.imgur.com/q7x5Y.jpg" alt="enter image description here"></p>
  
  <p>** Representation of diagram in my tool**</p>
  
  <p><img src="https://i.stack.imgur.com/jSgej.jpg" alt="enter image description here"></p>