Versions Compared


  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Removed copy/paste error about fast-forwards


Code Block
titleMerging Feature Branch Into Trunk
$ git checkout trunk
Switched to branch 'trunk'
$ git merge --no-ff branch-feature-AMBARI-12345
Updating ed28ff4..3ab2a7c
 ambari-server/include.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ambari-server/include.xml
  • Fast-forwards are OK here since trunk is always the source of truth and we don't need extra "merge" commits in the feature branch


titleNo Fast-forwards

Notice that the --no-ff option was provided when merging back into trunk. This is to ensure that an additional "merge" commit is created which references all feature branch commits. With this single merge commit, the entire merge can be easily backed out if a problem was discovered which destabilized trunk.