Commit 97811005 authored by Arnaud Blanchard's avatar Arnaud Blanchard

Updated DEVELOPMENT (markdown)

parent 0548ee8e
......@@ -26,4 +26,17 @@ To build and see the documentatoin do: `./doc.sh <project>`
The built documentation will be in `../blaar_build/doc/<project>/html/index.html` and will be launched automatically.
[[blgtk/GTK]]
\ No newline at end of file
[[blgtk/GTK]]
Source versioning GIT
=====================
The normal flow would be as below,
1) `git stash` your local changes on that branch.
2) `git pull origin branch_name -v` to pull and merge to locally commited changes on that branch, give the merge some message, and fix conflicts if any.
3) `git stash pop` the stashed changes.
4) `git push origin` branch_name -v the merged changes.
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment