workflow

I am receiving the "[remote rejected] master branch is currently checked out" error - essentially the same problem as the OP at this post ( Git push error '[remote rejected] master -> master (branch is currently checked out)' ), and following is what I have done so far to fix it, but now it seems I have a choice between having the above-stated problem or a new one - the "missing work-tree" error, and as explained below, this is where I am currently stuck. Please also note that I have a different requirement than the other question. I do NOT want two repos, one bare and one non-bare - just the

My team has been tasked with designing a web application that is workflow driven. I need some advice regarding the design. The workflows need to be dynamic. Meaning, users can define the workflows through some interface and apply those workflows to a given scenario (The definitions will live in a SQL 2008 Database). The scenarios are defined by the business and will never change. So there may be only 2 types of scenarios a workflow can be defined for. The workflows are not necessarily linear. Some sort of state will drive the workflow. States will also be dynamic, but only exist in a workflow.

We are using Git and our workflow consists of a 'dev' and 'master' branch which lives on GitHub and each developer's local repository. No work is performed directly on 'master' or 'dev', but rather in local branches and only merges happen on 'dev' and later with 'master'. We do not push local branches to GitHub. For some reason developers' local branches show up in the "Network" view on GitHub and this clutters up the network diagram (I should point out that the branch itself doesn't exist under the list of branches on GitHub). My question is whether this is normal behavior and happens

I have two branches master which is the main branch and feature_branch_1 which is very old and many commits behind the master. I need to merge feature_branch_1 into master, so I did: git pull --rebase origin master As expected there are tons of conflicts, soon after there was a need to develop another feature on a new feature_branch_2 and this is against the HEAD of master and definitely needs to be worked on before feature_branch_1 . Being more or less in the middle of the complex merge, how do I do a temporary commit on feature_branch_1 so I can come back to it later. I know I can just do a:

I am doing short-term contract work for a company that is trying to implement a check-in/check-out type of workflow for their database records. Here's how it should work... A user creates a new entity within the application. There are about 20 related tables that will be populated in addition to the main entity table. Once the entity is created the user will mark it as the master. Another user can make changes to the master only by "checking out" the entity. Multiple users can checkout the entity at the same time. Once the user has made all the necessary changes to the entity, they put it in a

I know there are already many questions here on this topic, but I've had trouble finding exactly what I need. We're a small team of developers currently using SVN but soon to be making a switch to Git. We are used to checking in changes and pushing to the live website throughout the day but currently lack any formal testing procedures, which is something we'd like to add. The way I'm used to doing this with SVN is: develop in a personal test environment check in your changes send the current repository files to a global (production-like) testing webserver, and test send the current repository

I need to build an app that gets files from a server and moves to another server. It was suggested that I look into using Windows Workflow Foundation (WF). I started to build the workflow but it is getting messy and I'm not sure I'm doing it the best way possible. Here is the basic worklow activities: Get a list of sources Determine if source is ftp or disk drive Get a list of files from the server If source is ftp then get the file with ftp get else if source is drive then read file from drive If target is ftp then ftp file to server else if target is drive then write to a drive else if

There is a pretty strong need for us to design some workflows around various processes. The problem is none of us actually know any workflow technology yet, and finding good data to compare the available options has been tedious and not entirely fruitful. So I figured I'd ask you guys. The main technologies we are looking at are Windows Workflow Foundation and eDocs Workflow. What other options are there? Sharepoint 2007 has workflow functionality too, right? Is that just based on WF? What are the pros and cons of the various technologies? How do they compare? EDIT: Also, one feature the