workflow
Git submodules workflow
You may want to try git subtree (alt link) instead. I’ve had a lot of luck with it, using both remote repos and clean (untied to master history) branches in my project.
Correct Git workflow for shared feature branch?
For a shared branch, I would go with #3, and use it as an “integration” branch to consolidate their work. The developers would have to use rebase to constantly replay their private branch on top of feature before merging back their work to feature, that way they are: solving any merge conflict locally (in their … Read more
Proper Way To Use Git/GitHub – PHP System with Dev/Testing/Production servers
Assuming you have a live server and a development server I would do something along these lines. Before even starting with a development cycle I would at least have two branches: Master – the development server runs on this branch Stable – the live server runs on this branch. So if a developer gets a … Read more
How do I synchronize two branches in the same Git repository?
If you don’t need the branch around: If you’ve merged foo back to master, “git branch -d foo” to kill the topic branch, and then “checkout -b foo” in the future when you need to hack on it again. If you do need the branch around: You can rebase your topic branch against the master … Read more
Lightweight workflow engine for Java
I agree with the guys that already posted responses here, or part of their responses anyway :P, but as here in the company where I am currently working we had a similar challenge I took the liberty of adding my opinion, based on our experience. We needed to migrate an application that was using the … Read more
How to draw (visualise) git workflows [closed]
You can describe your flow using JS code. Here is GitGraph.js – a simple JavaScript library which is meant to help you visually presenting git branching stuff like a git workflow, a tricky git command or whatever git tree you’d have in mind.
Workflow frameworks for Django [closed]
Let me give a few notes here as i’m the author of django-fsm and django-viewflow, two projects that could be called “workflow libraries”. Workflow word itself is a bit overrated. Different kind of libraries and software could call themselves “workflow” but have varying functionality. The commonality is that a workflow connects the steps of some … Read more
What is the preferred way to manage schema.rb in git?
I’m afraid the magic solution you’re looking for does not exist. This file is normally managed in version control, then for any conflicts on the version line just choose the later of the two dates. As long as you’re also running all of the associated migrations nothing should get out of sync this way. If … Read more