3 ms·
How is this in any way better or simpler than Git Flow? IMO Git Flow is conceptually easy to understand and easy to implement. Using it on a pretty decent sized
by king_magic 13y ago
How is this in any way better or simpler than Git Flow? IMO Git Flow is conceptually easy to understand and easy to implement. Using it on a pretty decent sized team (40+ developers) and it works great for us - and is easy for newcomers to the project to pick up.
- codereflection 13y agoThis essentially IS git flow. Edit: Never mind, I wasn't remembering git flow correctly.
- mattdawson 13y agoThis is most definitely not git flow. Git flow advocates explicit merges pretty much everywhere with no fast-forwards and definitely no rebasing.
- codereflection 13y agoYou're right, it's not. I need to stop commenting on HN before I've had coffee. :/
- middleclick 13y agoIs there a link where I can read up the type of Git flow that you are talking about?
- LoganCale 13y agohttp://nvie.com/posts/a-successful-git-branching-model/ http://nvie.com/posts/a-successful-git-branching-model/
- deleted 13y ago[deleted]
- shaggyfrog 13y agoRebasing locally before "publishing" (pushing) changes to the central repo is definitely okay. It should always be done before pushing the branch for the first time, really, because if someone else has modified develop since you started your branch, you want to make sure your changes are still working and won't break the build (on develop).