git - How can I merge finished work patch instead of its whole history into test branch? -

A developer starts working on a feature, "Fix a hardcode link" Calling, once done, it has been passed to another developer for a peer review. Peer reviewer is fine with code changes and merge feature branch in test branch "fix a hardcode link" Waiting for a technical test.

test where feature branches are merged once, another developer, staging is a branch where facility branches merge once Is given when he goes through peer review, TT and UAT.

The next developer starts working on the next card and creates a branch like this:

  git checkout test git checkout -b story / bar  < / Pre> 
 The developer completes the job and sends it for reviewer. Peer reviewer is happy with the code passing in the TT and UAT, all are happy and it goes on the PO. POO is happy  in feature branch merging   
  GIT checkout staging GIT merge merge / story / bar   
 that I did it It has been found that we are not only enclosing the patches fixed for the particular card, but also implementing the entire history that comes with the branch. The result is that  "Fix a hardcode link"  is staging but it has not been processed.  
 
 Is our approach and any suggestion  
 Should we take out our feature branches out of the scaffolding? In fact, you have to keep in mind the publishing workflow (push / pull) in mind, And from the merge workflow ( feature  to  test  to  staging  ...): Workflow of this publication A.  
 Any new  feature  branch should be developed above the latest official version that you will be using with that < feature .  
 If this is  staging , then this means:  
  git fetch git checkout -b newFeature origin / staged #hack ... # Ensure that the new feature still works as a top level # Since the staging can get other features # git rebase ori gene / staging # local and / or unit testing during the development of the new feature GIT Fetch ... # Git Push for review - u original newfactor   
 When you are merging the  feature  to > test  or  staging , you should rebus  newFeature  at the top of  test , then  at the top of staging , and then  Merge newFeature  (merge faster forward). 
 Any conflicts during the rebase mean that the facility has been rejected (the developer has to fetch, then resize it so that the  newFeature  branches are causing local trouble Why is that conflict).