X

The Integration blog covers the latest in product updates, best practices, customer stories, and more.

  • October 5, 2015

SOACS plus DevCS - Chapter 10

In this series of posts and videos, we will explore creating and deploying a SOA composite using Oracle Developer Cloud Service.


< Previous Chapter | Next Chapter >


Chapter 10 - Merge Requests

Before you start making changes, you should create a branch using gitflow:

git flow start feature start <name of feature>

I recommend some naming convention for the branch names, especially if you publish them to the remote Git repository. Something like: "$USER/$FEATURE_NAME" (e.g. "clara.coder/add_credit_card_authorization"). This allows humans to visually sort branches and scripts to filter based on user name.

Once the changes are made, make sure you add any new files and commit any changes:

git add --all

git commit --all -m "adding awesome new feature"

To make your changes visible to other members in your team, you must "publish" your changes. This pushes your local feature branch to the remote Git repository:

git flow feature publish

Once your feature branch is pushed to the remote Git repository, you can submit a merge request as demonstrated in the video.

Before you merge your feature branch back into the local develop branch (or even before you publish it for review), you can pull the latest from the remote develop branch as other members in your team may have finished their features before you. You can then run any final tests on this branch to make sure nothing from the merge broke your changes:

git pull origin develop

You can then finish your feature which will merge it with your local develop branch:

git flow feature finish

After finishing the feature, git flow will put you back into the develop branch. Finally, you must push your local develop branch which contains your feature to the remote Git repository:

git push

If you did not refresh your local branch to the latest or if it changed in the meantime, you will have to do a "git pull" to fetch the latest changes, re-run any tests to confirm your feature still works, and then re-run "git push".

If the branch you are merging into is protected, then the above command may fail because you do not have permissions to modify that branch. In this case, you will have to go back to your feature branch (or create a new one if you previously "finished" it) and publish it before going through the merge request process.

For more information on git flow commands, read this helpful page.

While Linux is used in the video series, all mvn and git commands are applicable to Windows.  Any variations will be called out in the accompanying blog.



Helpful links:

Be the first to comment

Comments ( 0 )
Please enter your name.Please provide a valid email address.Please enter a comment.CAPTCHA challenge response provided was incorrect. Please try again.