The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

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

Commit and code missing from master branch after merge

Kobi Rosenstein
July 25, 2024

I worked on a feature branch, and merged it via a PR. I think I used the "Squash" option, because the PR shows one commit message, which is made up of all the commit messages of the commits on feature branch. However the project and repo settings both only have "merge --no-ff " merge strategy checked, so I don't know how I could have even squashed.

In any case, the PR says merged, but none of the commits exist in the commit history, and the code changes do not exist on the target branch (or any other branch for that matter).

I read this post:

https://confluence.atlassian.com/bitbucketserverkb/commits-missing-from-pull-request-merge-on-target-branch-825786786.html

Which explains why i wouldn't see the feature branch commits, but I do not see the squash commit either, and I would still expect to see the code changes.

Force push is disabled at both the project and repo level, so it could not be that either.

How can i find where the code is at the moment, and how can I make sure this does not happen again, and how do I check that it has not happened in other branches as well?

Thanks.

0 answers

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

TAGS
AUG Leaders

Atlassian Community Events