Soho Posted October 7, 2011 Report Share Posted October 7, 2011 The developers in my team, including myself, have often faced the problem that we want some changes to be committed to a new branch. We are currently not using Plastic with an issue tracker, so the work flow is that branches are created manually when needed. Often it happens that someone makes some changes to a project and realize that those changes ought to belong in a sub-branch. Maybe the changes turned out to be a little to experimental or maybe the developer created a new branch, but forgot to switch to it (a common mistake). It would be most helpful if it was possible to create a new branch and keep uncommitted changes in the current workspace when switching to the new branch. Link to comment Share on other sites More sharing options...
psantosl Posted October 10, 2011 Report Share Posted October 10, 2011 Hi Soho! I think this is what you're looking for: but, instead of "when there are conflicts", just when you've pending checkouts. We're on it. Link to comment Share on other sites More sharing options...
Soho Posted October 12, 2011 Author Report Share Posted October 12, 2011 Ok, so this is yet another feature I have longed for that will be in 4.0. I am really looking forward to an official stable release of 4.0. Link to comment Share on other sites More sharing options...
psantosl Posted October 13, 2011 Report Share Posted October 13, 2011 In fact the feature you're looking for is even another step ahead because here we just allow you to "move" the checkouts to another branch when there are conflicts... but adding what you ask for will be a matter of minutes... we're on it. Link to comment Share on other sites More sharing options...
hampsterx Posted November 10, 2011 Report Share Posted November 10, 2011 second this awesome feature. our workflow is similar to Soho's also. Occasionally also a developer will make another change on a branch unrelated to what the branch was created for, eg minor tweak or bug fix. Often this is done unintentionally as they forget which branch they are on. What is the recommended workflow in this case? Eg how to move a few changed files out of one branch and into a new one Ideal would be to commit everything except the unrelated files. then move those onto a new branch. Have experimented with cherry pick but not too sure as yet~ Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.