Changes between Version 9 and Version 10 of DRM4G/Development

Timestamp:

Dec 7, 2016 4:51:03 PM (5 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -117 +117 @@
 * The '''develop''' branch reflects the whole evolution of the project. It shows all of the new features and bug fixes that have been included. This is the main branch where all of the work will be done.
 
+----
 If during development, you find yourself working in a team and  wish to share your code, push your work to our ''central'' repository in ''!GitBucket'', not ''!GitHub''.
 {{{#!sh
@@ -126 +127 @@
 git push origin :<branch_name> #deletes the same branch from the remote repository
 }}}
+
+----
+Another reminder, is that before ''pushing'' your work onto the remote repositories, you should always check that no changes have been made in them.
+{{{#!sh
+git remote -v update #updates your remote refs and shows the state of the branches
+git status -uno #informs you whether your current branch is ahead, behind or has diverged from the remote
+}}}
+
+In the case that changes exist in the remote repository, you should perform a ''pull'', resolve any possible conflicts, and then make the ''push''.
+{{{#!sh
+git pull origin <branch_name>
+#do necessary operations
+git push origin <branch_name>
+}}}
+
+
 
 === Adding new features ===