Differences

This shows you the differences between two versions of the page.

--- git-for-lieutenants [2013/01/09 12:04] – milan
+++ git-for-lieutenants [2013/05/03 11:07] – Added section on merging branches bp
@@ Line 90: / Line 90: @@
 When all the patches for your topic are applied and committed into your branch, you can choose whether and how to integrate them into a develop reference branch.
+To merge changes made in c_name/featureA branch into the master branch, switch to master branch first and then merge c_name/featureA branch into it
+   $ git checkout master
+   $ git merge c_name/featureA
 For example, once you merged all patches to a ''master'' branch on a local machine, push the local ''master'' branch to the server via
@@ Line 95: / Line 100: @@
    $ git push origin master
+Finally, the c_name/featureA branch can be deleted
+   $ git branch -d c_name/featureA
 ====== Merging workflow ======
 In oofem project, we have two long-running branches, master and stable. ''stable'' is updated only when a very stable release is cut and all new code is integrated into the ''master'' branch. Each time you have a new topic branch to merge in, you merge it into ''master''.