cidico Posted October 30, 2014 Report Share Posted October 30, 2014 Hi! In my workplace we are trying a new workflow using Git and, as always, I'm pretty happy using my Plastic SCM. But when syncing, the branch's name goes "wild". Are you planning supporting gitflow? Here is some text about the topic: http://nvie.com/posts/a-successful-git-branching-model/ Thanks in advance! Link to comment Share on other sites More sharing options...
manu Posted November 5, 2014 Report Share Posted November 5, 2014 Hi cidico! what do you mean by gitflow?, all the branching done in the article can be done using plastic. Link to comment Share on other sites More sharing options...
cidico Posted November 5, 2014 Author Report Share Posted November 5, 2014 Hi Manu! I was really concerned about the naming strategy.. hehe Last time I used Plastic, I've had some problems on this specific subject. Git fans were all crazy with the naming after the syncs were done... I've just tried to perform a sync on my current project and I've found some strange behavior. First, as gitflow states, the "feature branches" are deleted after the feature is ready, then we merge back to the "develop" one. I really don't like that, but I don't set the rules and the team prefer this way... I'm having a quite strange situation on a "dual head" scenario as you can see bellow: The big picture is this one: After I've tried to merge the second head back in the main branch and I've got this: Even if I perform the merge from the "/develop" branch into the "/main", the problem dual head problem keep happening. So, I can't sync my local repository back. Am I doing something wrong?! Thanks in advance! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.