Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Atlassian Stash branching and merging is not working as expected

Jewel Francis May 24, 2016

Hi Team,

I have merged a branch back into master as part of the pull request and I am not able to see the commit when I am visiting the commit history of the master.

Now, is this an expected behavior?

Warm Regards,

-Jewel

2 answers

0 votes
Tim Crall
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 25, 2016

It doesn't sound expected.  Can you post some screenshots?

0 votes
Radu Dumitriu
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 24, 2016

The only way to loose commits is to:

----O----*----*----/M----*    <-- HEAD
     \            /
      \--.----.--/--x     <-- deleted branch

the x commit will be lost (but you need to force the deletion, as git complains). Are you sure this isn't the case?

Jewel Francis May 24, 2016

No, I am pretty sure that is not the case. The changes happened during the merge of the pull request is not coming here. That's the problem.

Radu Dumitriu
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 25, 2016

Then, IDNK. git fsck, git reflog, etc

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events