Now I am in a feature branch but don’t whether it is created from develop or release branch. Can any one please tell me how can I get parent branch name of current git branch.
I often start my journey with a small fix on the master branch that eventually appear more complex than initially thought. So I easily fall in this situation: * Damned I have more stuff to check (HEAD -> master) * Forgot to fix this as well… * Oops, fixed that too * Fixed this * […]
Is it possible, to merge a branch and automatically delete it with a single command? The delete step should only be executed if merging was successfull. Thank you all!
I’m not happy with the title but I think I overcomplicated my explanation and it is as simple as above in the end. We are using a branching model with a central origin repo, a “develop” branch, with feature branches off this branch. I had developed a local set of changes off the develop branch, […]
While developing a feature branch locally, it turned out the feature needs huge changes. In order to minimize the amount of work and stress during the merge, I thought of first merging locally master into my branch, resolve all conflicts, and then merge my feature into master – which should then be a fast forward, […]
We have a web app for which we have a couple of corporate customers. We have recently decided to offer it as a SaaS app and to follow the lean approach (in parallel with our corporate offering). Which means we’ve got experiments on the go that might not make it into production. Before we went […]
I usually using git for versioning, but right now I am stuck with sources in a svn repository, so I am using git-svn to access that repository. However this seems to lead to some trouble, when I try to use local branches. I usually only commit my local repositories about once a day, so I […]
How can I generate patch for all commits in a given branch by knowing only the branch name? This step is part of a complex workflow all of which is being automated. Hence requiring someone to manually determine the first commit in the branch is not an option. Note that anything relying on reflog is […]
I installed a fresh instance of gitosis, and also have an old one. What do I have to do to move the repos from the old to the new server? Clone on the new server? What do I have to change on the developer computers, to switch the remote branch? Or do they need to […]
If someone has deleted the remote branch, is there any way I can pull from the same repository, and get my local branch deleted as well? It would be handy not to have all developers do the manual removal of a branch when we’re done with a feature.