FAQ Database Discussion Community


Do I need to checkout and pull a remote git branch before I merge it in?

git,merge,git-merge,git-flow
My normal process for merging in develop to my feature\my-feature branch is: [email protected] ~/myRepo (feature/my-feature) $ git checkout develop $ git pull $ git checkout feature/my-feature $ git merge develop $ git mergetool Can this be replaced with: [email protected] ~/myRepo (feature/my-feature) $ git fetch $ git merge origin/develop $ git...

Should git-flow branches be available on bare repository and its clone?

git,version-control,git-flow
I am attempting to start using git-flow. I have installed and initialised git-flow on my master repository. It is all correct and shows in git.config. It is linked to a bare repository, and I/others clone the bare repository when working. However, when I clone the bare repository, the develop branch...

Release with maven + gitflow

git,maven,ssh,release,git-flow
i am using Maven + gitflow to generate releases of my application, but when i try start release i got one error. Command to start release: mvn jgitflow:release-start Error: Caused by: org.eclipse.jgit.errors.UnsupportedCredentialItem: ssh://[email protected]:10022: The authenticity of host '127.0.0.1' can't be established. RSA key fingerprint is 7e:03:51:7b:55:a5:cd:de:4c:7a:0d:1b:43:75:08:68. Are you sure you...

How does the git-flow plugin integrate into IntelliJ IDEA?

java,git,intellij-idea,git-flow
For example, git flow feature start MYFEATURE Is there a way git-flow operations like this can be done from within IntelliJ IDEA?...

Why does git-flow not delete remote *release* branches (when finished)?

git,git-flow
Referring to "out of the box" developer workflow via git-flow (version 0.4.2-pre). For a release, we perform these steps: git flow release start 4.2.3 maven release:prepare release:perform git flow release finish 4.2.3 Now, after the release finish command, git flow has deleted the local branch release/4.2.3 (after merging into master...

Programmatically determine if git-flow is initialized

git-flow
Is there any way to do this? Is the repo considered initialized if it simply has the git-flow directives in .git/config like .... [gitflow "branch"] master = master develop = develop [gitflow "prefix"] feature = feature/ release = release/ hotfix = hotfix/ support = support/ versiontag = v ?...

GitHub Flow and Daily Deployments (Syncing with Master)

git,github,deployment,git-flow
We are a software company that has a few different projects and lines. We have decided to go with the GitHub Flow model. However, we hit a small roadblock and was wondering how it's handled elsewhere. Our developers... create Branch to Develop; once they finish the branch they sync with...

Having Trouble Installing GitFlow

git,github,git-flow
I'm having problem installing gitflow. I am using this tutorial: https://xinyustudio.wordpress.com/2012/03/26/installing-git-flow-in-windows/ I'm stuck at Step 3 When I run git clone git://github.com/nvie/gitflow.git -–recursive I got this result: Cloning into 'gitflow'... remote: Counting objects: 1407, done. emote: Total 1407 (delta 0), reused 0 (delta 0), pack-reused 1407 Receiving objects: 100% (1407/1407),...

Git-Flow and dependencies

git,git-flow
We're running into a strange case with, specifically with Git-Flow and I'm wondering how other developers have solved this. So here's the issue: Dev 1 is working on feature/thing Dev 2 is working on feature/different-thing These are independent features, but feature/different-thing is going to make changes to the API that,...

How do you use git in “solo-development” (without team)?

git,workflow,development-environment,git-flow
I work as a freelancer on small projects, and all of them I'm doing alone, without a team. I tried to use the Git Flow. At first, all was well. There were branches for features, small commits with meaningful description, merges. But the process always ends with enormously large commits...

git-flow finish release - selective merge

git,git-merge,git-flow
We've recently started using git-flow in our company, and we've came across the following issue: We have a DEV_MODE boolean that controls the level of logging in the app, we want the develop branch to always have DEV_MODE=true. However, when releasing a version we change the DEV_MODE to false. When...

How do you release a bugfix to a previous version and tag it?

git,git-flow
We are trying to adopt gitflow into our process at work. Gitflow is pretty simple when it comes to hotfixes. However, I'm unclear on how I would fix a bug on a previous version of our system. For example, let's just say we're on version 8.1.3 and I need to...

Is it possible/desirable to have a 'master', 'test' and 'develop' branch when using git-flow?

git,git-flow,git-workflow
I am currently working on a project where we are in the process of migrating to Git. We are trying to figure out what workflow to use. We are quite keen on git-flow, but have an issue. As I understand git-flow, developers create feature branches off of develop, once they...

Local branches are tidy, but all the remote branches are still there… Any suggestions?

git,atlassian-sourcetree,git-flow
I have been happily merging branches locally via the "finish feature" option in "gitflow"... This also deletes the local version of that branch. I have only just realised all of my remotes copies of these branches are still up and running. Should i merge the branches in on the remote...

TeamCity non-deterministic build triggering with Git

git,teamcity,git-flow,buildconfiguration,vcs-trigger
I use a GitFlow branching strategy. I like to have 3 build configurations per project: Integration - builds from develop, feature/* and hotfix/* with branch specification +:refs/heads/(develop) +:refs/heads/feature/() +:refs/heads/develop/() +:res/heads/(hotfix/*) Beta - builds from beta/* with branch specification +:refs/heads/(release/*) Release - builds from master with branch specification +:refs/heads/(master) Note the...

How sync work using git-flow

git,version-control,git-flow
I and my co-worker are working to a project. There is a --bare remote repo from which we have cloned to our pc. Then we have both initialized own personal repos with git-flow. Now I have develop and master branch. Which branch shoult I use to sync my work with...

Is there a way for Git Flow to Start & Publish a Feature

git,git-flow
Right now here is what I had to... git flow feature start feature_name git flow feature publish feature_name Is there a way I can do both in one shot. to finish it off, I do: git flow feature finish -F feature_name And that closes the remote as well....

Move develop changes to a new feature branch

git,git-branch,git-merge,git-flow
For my project I use git-flow. I have master and develop branch synchronized with remote-repo Usually for all changes I create a feature branch, edit the files, commit the changes on the feature branch and close the branch with a merge in develop. But sometimes I forget to create a...

Why is git flow feature checkout being deprecated? What should I be using instead?

git,deprecated,git-flow
I'm running git version 2.3.6 and git flow version 1.8.0 and when I run commands like git flow feature checkout <branch> I get the message: The command 'git flow feature checkout/co' will be deprecated per version 2.0.0 Does anyone know why this would be deprecated and/or what I should be...