Changes between Version 11 and Version 12 of DRM4G/Development


Ignore:
Timestamp:
Dec 12, 2016 12:02:55 PM (6 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v11 v12  
    143143}}}
    144144
    145 
     145{{{#!comment
     146Another way to avoid conflicts when making a push in Git:
     147Taken from http://stackoverflow.com/questions/18529206/when-do-i-need-to-do-git-pull-before-or-after-git-add-git-commit
     148{{{#!sh
     149git stash #stash your local changes
     150git pull #update the branch to the latest code
     151git stash apply #Merge your local changes into the latest code
     152#Add, commit and push your changes code
     153git add
     154git commit
     155git push
     156}}}
     157}}}
    146158
    147159=== Adding new features ===