Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Sourcetree / BitBucket

kstiles31 May 14, 2025

I am a solo dev, the way i have structured my branches is as follows:

I work locally, then commit to Development

I merge Development into Testing, YML will deploy to testing env

I merge Testing into Staging, YML will deploy to staging env

I merge Staging into Production, YML will deploy to production env

 

This process has been working well for me for over a year.

Recently I created a new branch Feature because I needed to put the latest commit on Development on hold for a while. Now when I merge (and go through my normal waterfall process), it appears Feature, Testing and Staging are a single branch and none of my pipelines run.

Happy to provide additional information, I am hoping to understand what happened, and get back to 'normal' please see screenshots from bitbucket and sourcetree:

 

*Additionally, I recently added a new user (green) and removed a user (blue) in an attempt to separate personal and business repos.

Screenshot 2025-05-14 082849.pngScreenshot 2025-05-14 082855.png


 

1 answer

1 accepted

0 votes
Answer accepted
Mark C
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
May 19, 2025

Hi @kstiles31

Thank you for reaching out to the community.

Based on the commit history, it started after the merge commit on 2025-04-04.

Could you confirm the merge strategy used in that merge commit?

Regards,
Mark C

kstiles31 May 20, 2025

It looks like I merged Testing into Production, not sure why I did that (more than likely a mistake), but usually I would not, I would / should merge Testing into Staging, then Staging into Production.

Mark C
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
May 22, 2025

No worries, @kstiles31

Moving forward, I think you can follow your workflow again.

For your Pipelines trigger, however, you mentioned it is not firing builds anymore, could you share your Pipelines trigger, please? Is it default or using branches?

Regards,
Mark C

kstiles31 May 28, 2025

The pipeline trigger is branches.

I believe the issue was not selecting the option to create a commit even if a fast forward was available.

When selecting that option everything worked as intended.

I am not sure what a fast forward is, or why all of a sudden that would be available (perhaps an upgraded version of SourceTree), but it appears that was the issue.

Like Syahrul likes this

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
PERMISSIONS LEVEL
Product Admin Site Admin
TAGS
AUG Leaders

Atlassian Community Events