git-workflow

I'm fairly new to git and Jenkins. We want to use Jenkins and follow the feature-branch-workflow concept , which I believe is similar to the GitHub flow . I'm aware that the master branch should always be what's currently deployed in production, but then when should the master branch be updated? It seems like there are two choices: BEFORE deploying to production: A pull request gets approved and the successful merge with master triggers the build, deployment to a staging environment, QA testing, and then someone pushes a button to deploy to production AFTER deploying to production: Something

This is the workflow we currently follow: Finish a feature and merge it into develop branch Create a release branch from develop Run build scripts on release branch Create a pull request to merge the release branch into master Accept the release branch pull request and merge The master branch can then deploy to live server by running deploy command This all works great, except in my Git repo my branches are out of sync master is now behind develop because it doesn't have the merge commits that happened from the pull request merging the release branch into develop . But master is also ahead of

After struggling with and sorting out a workflow for web development with git, I've been tasked with adding in a staging server at the last second. We develop/test locally and push out to a repo, and now there needs to be a sandbox in between so people in other departments can play around and try out new things without breaking stuff. Remote repo needs two long-running branches (in the spirit of nvie's branching model), master and develop. We need to be able to push to one repo, and checkout the develop branch to test.site.com docroot, and when ready, merge develop into master and checkout

How can I setup a git repository on a local system ? (I am on a windoze box) This is the setup I am trying to achieve: (everything is on my local machine) host folder (which acts like central repository) client folder I want to do all my dev in the client folder. Once I am done, I'd like to push it to the host folder. This is what I've done: (using git bash on windows) cd d:/adinsert mkdir host cd host git init cd c:/ mkdir client cd client git init git remote add origin d:/host // Added some files in client folder and commited them git push origin master When I push stuff to origin, git spits

git is supposed to be a decentralized system, but all the tutorials and best practice workflows I have found on google suggest using a server (usually github, or else set up your own) I am using git for small personal projects (2-3 people), where can I find a best practice workflow for syncing changes directly between the team members machines. Alternatively, what are some compelling arguments for why I should avoid this and instead set up a 'central' server? Thanks, Ben Depends on what you mean by "server". Git will work happily without a central server, although many teams find it convenient

I'm writing a very long document in LaTeX. I have my work computer and my laptop, and I work on them both. I need to keep all the files synchronized between the two computers, and also would like to keep a revision history. I chose git as my DVCS, and I'm hosting my repository on my server. I'm also using Kile + Okular to do the editing. Kile doesn't have an integrated git plugin. I'm also not collaborating with anyone on this text. I'm also thinking about putting another private repository on codaset, if my server for some reason is not accessible. What is the recommended workflow practice in

I have two branches: master and dev I want to create a "feature branch" from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev ... (some work) $ git commit -am "blablabla" $ git push origin myfeature But, after visualizing my branches, I got: --**master** ------0-----0-----0-----0-----0 ------------------------**dev**----**myfeature** I mean that the branch seems ff merged, and I don't understand why... What I'm doing wrong? Can you explain me please how you branch off from another branch and push back to the remote repository for the feature branch? All that