Your Ad Here

advanced code snippet search

Posted By

narkisr on 01/20/09


Tagged

Bash git


Versions (?)

Who likes this?

1 person have marked this snippet as a favorite

mauroego


Git workflow

 / Published in: Bash
 

A simple Git work-flow in which we keep master free of conflicts & rebase changes in a feature branch (to be merged).

Expand | Embed | Plain Text 
  1. $ git co master
  2. $ git pull
  3. $ git co -b feature_branch
  4. $ git commit --amend  # work work work ... 
  5. $ git co master
  6. $ git pull # pulling others work
  7. $ git co feature_branch
  8. $ git rebase master # merge conflicts, it better if they happen here
  9. $ git co master 
  10. $ git merge feature_branch # this should go clean
  11. $ git push

Report this snippet  

You need to login to post a comment.