![]() Finding anything in a history looking like that is close to impossible. I just grabbed the first example I could get a hold of easily – this screenshot captures a recent state of a project I’m currently involved in. This isn’t the worst mess I’ve seen as a result of applying GitFlow principles – far from it, actually. Try to find out how the project progressed from something like this: Because of this “advice” (which is presented as some absolute and obvious truth, when in fact it’s nothing more than an opinion-based convention, and an unpopular one at that), the history of a project managed using GitFlow for some time invariably starts to resemble a giant ball of spaghetti. This paragraph alone caused more damage than the other parts of the article combined. The -no-ff flag causes the merge to always create a new commit object,Įven if the merge could be performed with a fast-forward. definitely add them to the upcoming release: The absolutely worst part of GitFlow is this advice:įinished features may be merged into the develop branch So what is it that irritates me about GitFlow so much? It makes the project’s history completely unreadable In this article I want to explain precisely the reasons for that distaste, and present an alternative way of branching which is superior, at least in my opinion, to GitFlow in every way. Now, after having some hands-on experience with GitFlow, and based on my observations of others using (or, should I say more precisely, trying to use) it, that initial, intuitive dislike has grown into a well-founded, experienced distaste. ![]() I quickly dismissed the article and continued to use Git the way I always did (I’ll describe that way later in the article). I couldn’t see a single benefit of using such a heavy approach. I was deeply unimpressed – I thought it was a weird, over-engineered solution to a non-existent problem. I remember reading the original GitFlow article back when it first came out. It certainly _is_ everywhere for me personally – practically every project at my current job uses it, and often it’s the clients themselves who have chosen it. GitFlow is probably the most popular Git branching model in use today. Implementing OneFlow on GitHub, BitBucket and GitLab OneFlow – a Git branching model and workflow This post is part of a series of articles on working with the Git source control system.įollow-up to 'GitFlow considered harmful'
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |