Changes between Version 9 and Version 10 of DRM4G/Development


Ignore:
Timestamp:
Dec 7, 2016 4:51:03 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v9 v10  
    117117* 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.
    118118
     119----
    119120If 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''.
    120121{{{#!sh
     
    126127git push origin :<branch_name> #deletes the same branch from the remote repository
    127128}}}
     129
     130----
     131Another reminder, is that before ''pushing'' your work onto the remote repositories, you should always check that no changes have been made in them.
     132{{{#!sh
     133git remote -v update #updates your remote refs and shows the state of the branches
     134git status -uno #informs you whether your current branch is ahead, behind or has diverged from the remote
     135}}}
     136
     137In the case that changes exist in the remote repository, you should perform a ''pull'', resolve any possible conflicts, and then make the ''push''.
     138{{{#!sh
     139git pull origin <branch_name>
     140#do necessary operations
     141git push origin <branch_name>
     142}}}
     143
     144
    128145
    129146=== Adding new features ===