hotfix

I am in need of help setting up a TFS branching structure. The current scenario is as follows, our application is a SaaS, and I believe we need multiple "Release" branches simultaneously. Going through the TFS Branching Guide III, I'm fairly certain that we will need the "Advanced" branching model. We start with having a "main" branch, which will house the application as it stands right now (we're coming from Visual Source Safe). From that we will create a "Development" branch, and leave that alone for now. We will also create a new "Service Pack", "Hotfix", and "Release A" branch tree which

We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don't quite use the normal Gitflow workflow. I understand that usually you would branch your features , they would merge into develop when finished, you would create your release , release gets merged into master and you deploy that, as an actual "versioned release". However, as this is client work, we don't do "releases", instead features are deployed as and when they are required, so changes from our feature branches are merged into master on an ad-hoc basis.

With the regularity of VS2010 crashes increasing as I use it, I was looking for a list of hotfixes. This blog post says there is no official list, so let's make one (RTM only please). Or is this page sufficient instead: https://connect.microsoft.com/VisualStudio/Downloads ? Insufficient Memory Error on Cut or Copy https://connect.microsoft.com/VisualStudio/Downloads/DownloadDetails.aspx?DownloadID=29729&wa=wsignin1.0 Enable Managed Incremental Build for Visual C++ projects (wasn't available for configuration previously) http://code.msdn.microsoft.com/KB982721 paulgutten I have found the

I installed MongoDb on a windows server 2008 R2 and the hotfix KB2731284 is not installed, but I cannot restart the server easily. In the hotfix description, I got this message "You run an application that uses the FlushViewOfFile() function to clean up memory-mapped files from the paged memory pool." (see https://support.microsoft.com/en-us/kb/2731284 ) My question is, when the funtion FlushViewOfFile() is called? My application is just writing in a collection and get data from it. Do I risk to get some wrong behaviors? I think you can run MongoDb without applying the Hotfix, but I would not

I'm using InstallShield 2013 to make a Basic MSI installer for an application that requires Windows Platform Update KB2670838 . For .NET frameworks and other requirements, I select them in InstallShield in the Redistributables section. KB2670838 is not available. If I download KB2670838 from Microsoft I get a .msu file. Can that be included in the installer somehow so that it automatically installs if needed? If not, is there a way to stop the install and tell the user that "KB2670838 is required but not installed. Get it here..."? @Glytzhkof Good point. So how do I get InstallShield to abort

Gitflow 实际上就是各个分支的拉取、合并的问题。 代码库存在两个永久性的分支：master和develop，未来所有的开发工作都围绕这两个分支进行派生跟合并。 。 除了master和develop分支。有三类分支的命名规则：feature、release、hotfix。 master ：存储了正式发布的历史。 develop ：作为功能的集成分支。 feature：开发新功能的分支。 hotfix：bug修复分支，用于修复线上运行环境发现的bug。 release：版本发布分支。 feature 分支： 派生于develop 合并于develop 开发一个新功能，从 develop分支 派生一个分支。开发完成之后，合并到 develop分支 ，并且删除 feature分支 。 release 分支： 派生于develop 合并于master、develop develop分支上有了做一次发布的足够功能，就从develop分支上checkout一个发布分支。用于开始发布循环，所以从这个时间点开始之后新的功能不能再加到这个分支。发布完成之后将 release分支 合并到 master分支 和 develop分支 并分配一个版本号打好Tag。并且删除 feature分支 。 hotfix 分支： 派生于master 合并于master、develop 线上发布版本有bug的时候，从

Git 仓库申请流程 开发主管向 Git 管理员提交 Git 仓库申请【邮件:发送给 Git 管理员，抄送给项目经理，申请表可向 Git 管理员获取】 Git 管理员审批开发主管的申请，审批以下具体信息: 审批邮件是否抄送给项目经理 申请的 Git 仓库名称是否符合命名规范 若审批通过，则 Git 管理员完成以下任务: 创建 Git 仓库 设置开发主管为 Git 仓库的 Master 角色(管理员，具有该 Git 仓库的管理权限) 将 Git 仓库地址告知开发主管【邮件:发送给开发主管，抄送给项目经理】 若审批不通过，则驳回申请【邮件:发送给开发主管，抄送给项目经理】 初始化 Git 仓库 第一步:克隆远程仓库 开发主管从 Gitlab 中克隆远程仓库 命令示例: git clone <仓库地址> 第二步:提交并推送初始版本 开发主管提交代码初始版本到 master 分支，并推送至 Gitlab 系统 开发主管在 Gitlab 系统中设置 master 分支为 Protectd 分支(保护分支)Protected 分支不允许 Developer 推送代码，但 Master 可以推送代码 命令示例: # 提交本地修改: git add . git commit –m “提交日志” # 推送 master 分支: git push origin master 第三步:创建开发分支

If you try to follow the git-flow branching model, documented here and with tools here , how should you handle this situation: You have made a 1.0 release and a 2.0 release. Then you need to make a hotfix for 1.0. You create a hotfix branch off the 1.0 tag and implement the fix there. But what then? Normally you would merge to master and put a 1.1 release tag there. But you can't merge 1.1 to a point after 2.0 on master. I guess you could put the release tag on the hotfix branch, but that would create a permanent branch beside the master that would contain a release tag. Is that the right way?