I’m looking at maybe setting up a teamcity CI server for use with a git (github) repo. I’d like to have teamcity build each branch that gets pushed to the main repo and it seems like TeamCity supports this now. When a branch gets pushed I’d like to create a new IIS website/app pool etc […]
If you have a branch which you forked off of master and then developed your feature in it…when it comes to merging back into master, I’ve heard 2 different approaches: First merge master into the feature branch, and then merge the branch back into master. Merge your branch into master. Can anyone tell me which […]
I have found Gitkraken a few days ago and was playing with it a bit. I came to a point where I did not found any useful informations on the internet or the gitkraken faq about my question anymore. I have the following case: Local repository with 2 branches develop & master Gitlab server where […]
Coming from the TFS world and having just gotten comfortable enough with Git, I am about to propose to my team that we should incorporate the Gitflow workflow as pointed out by the famous article by Vincent Dressen going forward. Almost all modern-day literature surrounding branching strategies voice the effectiveness of the Gitflow workflow, which […]
Git branch heads and tags are pointers to commits, and these pointers can move either implicitly (after a commit) or explicitly (after a branch -m). Does Git record the history of the state of these pointers? I see at least two reasons for this: To see the state of the repo two days ago, including […]
We’re migrating from SVN, and also merging a bunch of branches. To massively simplify, we have a branch B which was forked a long time ago, and has a little bit of development, let’s say 8 files modified, out of hundreds. Meanwhile, huge changes have happened on master: A | X—(a few changes)— B | […]
: A T / \ i B C m : : e D E \ / | F V : git merge-base B E allows to find where a the common ancestor A of the two commits. Is there a way to find the commit F where the two branches are merged again?
How can I get a list of all the files that were changed in a branch? I can’t do a git-diff because the branch is already merged into master. I would need a way to list all the commits in a branch and extract the path of the files, without duplicates. If anybody has done […]
We recently migrated to Git hosted in TFS ’13. A few branches have been created, merged and then deleted using Visual Studio. However, these branches are still visible in the TFS web interface when going to Code > Branches. I expect this to become a huge mess if this will not be cleaned up regularly. […]
We have a large rails project that runs on a production and staging server. Is it a good idea to create tags everytime we deploy to staging or production (this would happen automatically with capistrano). Or is better to create branches named “devlopment” and “staging”, (master would contain the production status)?