Pull Request /PR (Create n Complete by Semi Linear Merge Merge) Git

CREATE A NEW PR (See Create PR)

• Release release has 22 commits
• featurenine branch has 6 commits
• Create PR
  • 

 

 

Complete the PR - Using Semi Linear Merge  MERGE TYPE
Step 1: Complete your PR

• in devOps > Go to that Merge
• What Semi Linear Merge do
  • Semi-linear is a mix of rebasing and merge.
  • It will do a rebase first. That means it will cherry pick each commit and it will place on the top of your destination head. And then it will do merge.
  • All the histories are getting preserved and a new merge commit is also created. So it's a mix of rebasing and merge.
  • First the commits are in the pull request, are rebased on top of your master. Then those rebased pull requests are merged into the destination branch.

 

• Complete merge by selecting (Rebase and fast-forward)

• Result
  • featurenine will now show - all of release and all of featurenine  at top with PR commit
    • 
• Release branch commit will be
  •