#git workflow

[astelor]

git workflow but I'm having everyone create a private repo and add me as collaborator and everyone can push to master. no more sending files via chatrooms, push it to your own repo.

[sivaniverse]

Git Workflow - A Visual Walkthrough

If you're like me when learning Git, then the workflow is very confusing as a beginner. In this video, I explained the workflow in a simpler manner. I hope this helps you guys visually understand the workflow of Git.

Check it out if you are a visual learner like me.

[vivektech]

Use Git if: ✅ You need speed and distributed development ✅ You want better branching and merging ✅ You work offline frequently

[gsmplusinfotceh-blog]

Managing Development Workflow with GIT

Git is a free and open sourcedistributed version control system. VCS is a software that helps software developers to work together and maintain a complete history of their work. It is highly expected to follow standard coding practises but the code revisioning claims equal importance than maintaining the standards.

Let’s discuss a standard flow of maintaining the Code revisions using GIT with an example work-flow,

Git Workflow for Development Teams

Start working on a new feature branch

git checkout -b 1102_gitdocuments

Note:- Feature branch name represent ticketid(1102) and short description(gitdocuments) of work

1.Do your work(CRUD) in working directory

touch gitworkflow.doc git status git add gitworkflow.doc git commit -m "Created gitworkflow.doc Basic Steps" touch gitbestpractice.doc git status git add gitbestpractice.doc git commit -m "Created gitbestpractice.doc Do's and Don't" git log

2.Make sure you are up to date with the latest from the remote development branch. Roll your local changes on top of them:

git checkout development git pull origin development git checkout 1102_gitdocuments git rebase development

Note:- When Conflict Occur Fix any merge conflicts.

Consult with the author(s) of the changes

Consult with the Team Lead

Use a merge tool

When in doubt, have a merge party

Communicate, communicate, COMMUNICATE!

3.Wrap up all of your local commits you’ve made into one commit by performing an interactive rebase:

git rebase -i development

4.When your editor opens, combine all commits into one by squashing every commit into the first:

pick ae3a3dc Created gitworkflow.doc Basic Steps squash 3c82ad8 Created gitbestpractice.doc Do's and Don't

5.Now pretty up your single commit message :

[#123456] Git Documents * Created gitworkflow * Created gitbestpractice

6.Merge your feature branch into development, push it up for your team, and delete your local branch

git checkout development git merge 1102_gitdocuments git push origin development git branch -d 1102_gitdocuments

7.Repeat for every other feature

QA

Once all features for a development are ready to be shipped out, perform the following:

1.Merge development into qa branch

git checkout qa git merge development

2.Push up your changes

git push origin qa

Production

Once all features for a qa are ready to be shipped out, perform the following:

1.Merge qa into master

git checkout master git merge qa

2.Tag the release (I version my projects using the major.minor.patch versioning)

git tag v1.0.0

3.Push up your changes

git push origin master git push --tags

[dyl-an-13-blog]

Git me, baby, one more time

Git workflow is important; really, really important. I wish I understood what a good git workflow looked like before I started the 3 week project, and how not having a good workflow will inevitably loose you hours (or days!) or work and be a giant headache. 

  WHAT NOT TO DO: 

Don’t do this, seriously. Our group would update the master branch, work on individual feature branches, then occasionally push feature branches up. We would also sometimes download everyones feature branches, merge them with all together locally, then merge it with master, and then push back up to the repo. This was SO wrong, we eventually lost a day and a half to repairing out workflow that we really could have used on making the project better. 

  WHAT YOU SHOULD DO: 

Depending on weather you want your teammates to be contributors on your repo, there are a couple ways to have a good workflow. The way we did it was pretty simple, everyone would pull the most recent master, and then branch off into a feature branch that they would work on. When the feature branch was complete  and working, you would return to the master branch, pull again if needed and then create a new branch based off the most recent master. Then you merge the copy of the master branch with your feature branch, and fix any merge errors if there are any, and push that branch to the repo. We would then create a pull request with that branch using the website. It’s common to tag all of your teammates in the pull request and coordinate with them before finalizing the merge. 

  You can also have every member of the team fork the repo, and work on their own fork, eventually submitting the pull request on their own. The rest of the workflow looks basically the same. 

We found that after implementing this workflow we didn’t encounter any merge conflicts, and things rarely broke. Our development got a lot faster and it got rid of a bunch of our stress.

[renooble-blog]

git workflow -- emergency fix or how to stash

You’re plowing away in your feature branch in the zone, you’ve messed with 10 files and it still doesn’t work. However you think that in four hours your creation will spring to life.

All of a sudden, you get 20 emails with 500 error reports from production. aaagh! You need to fix that, Quickly!!

$ git checkout master

Not so fast!  If you do that, the 10 files you touched will move with you to master.  But you're not quite ready to commit anything either.  It is time to stash away your changes.

$ git add [some-files] $ git stash

Now you can

$ git checkout master

{ FIX THAT BUG, quick!}

Do your testing, fab update_testing, more testing, fab update_prod, and get back to where you were:

$ git checkout feature_branch $ git stash apply

and you can pick up where you left it.

Note that the part where it says "bugfix" could include another branch, and includes testing, deployment, email, etc, etc.

 Some references on multiple stashes, selective stashing, listing stashes or clearing them:

 list of http://gitready.com/beginner/2009/01/10/stashing-your-changes.html

http://nathanhoad.net/how-to-git-stash

[renooble-blog]

git workflow to develop a small ( 1 -3 day) feature as a single user (while other users, like Javi in the example commit to master. see: Git Workflow part 3 for more details. note the abbreviations:

gpu = git pull

gp = git push

co = git checkout

ga = git add

gcm = git commit -m