Finish Feature not finishing

Sourcetree Version 2.3.5.0

 

Hi

I am a solo Web developer and use GIT and Sourcetree to keep track of my changes.

I use Master branch for updating and obviously Development for changes.

I mainly use origin (Bitbucket) for back up.

While developing, my plan is to make features to test and add changes, if it works, I want to push it back to development and after testing, merge with Master which I will load to live site.

Creating features works, but I can not get them to finish and merge back to Development.

Sourcetree just hangs trying to finish the tree. No errors, nothing. It just shows running screen but never finish. If I create a new feature and then finish it, it works. If I make changes and commit, it just hangs.

Any help would be appreciated, I really want to use the feature. Sorry for the TL;DR

Attached you will find a screen shot of my tree as well as my git config.

sourcetree.JPG

And my git config:

[core]
    repositoryformatversion = 0
    filemode = false
    bare = false
    logallrefupdates = true
    symlinks = false
    ignorecase = true
    hideDotFiles = dotGitOnly
[gui]
    wmstate = normal
    geometry = 887x427+156+156 199 192
[remote "origin"]
    url = [REMOVED FROM TEXT]
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[gitflow "branch"]
    master = master
    develop = development
[gitflow "prefix"]
    feature = feature/
    release = release/
    hotfix = hotfix/
    versiontag =
[user]
    name = [REMOVED FROM TEXT]
    email = [REMOVED FROM TEXT]
[branch "development"]
    remote = origin
    merge = refs/heads/development
[pack]
    buildbitmaps = false
[gitflow "branch.feature/single_dealer"]
    base = development
[gitflow "branch.feature/Car_import_V2"]
    base = development
[gitflow "branch.feature/auction_processing"]
    base = development
[branch "feature/auction_processing"]
    remote = origin
    merge = refs/heads/feature/auction_processing
[gitflow "branch.feature/car_search"]
    base = development
[branch "feature/car_search"]
    remote = origin
    merge = refs/heads/feature/car_search

2 answers

1 accepted

Updated embedded GIT. had error extracting, but it done it.

Did another test, now it works.

Thanks so much!

Q..

0 vote

Hi

You said 'Sourcetree just hangs trying to finish the tree' can you explain a bit more about this?

Is the tree the log view?
Looking at the image you posted, I assume you think it is wrong, what are you expecting to see?
How do you merge your feature branches?

Sorry, 'finish the tree' was the wrong wording. I meant finish the feature, using Git Flow.

The image is the log view, showing 2 branches with features just hanging, because I cant get them to finish.

These are my steps:

I commit devel

I then create a feature with Git flow. (from devel)

start feature.JPG

Work on it and commit.

Now I want to close it and merge back to devel:

So I click on Git Flow, and then click finish the feature.

feature close.JPG

feature close 2.JPG

This is where the problem starts:

It hangs just doing this, noting else happens. No errors or anything. It just hangs there trying to complete the feature with the bar running the whole time

Capture.JPGfeature close 3.JPG

What version of git are you running, see the  Tools/Options/Git tab

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

561 views 1 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you