It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Merge to master branch got stuck

Hey everyone! I have been getting this weird problem lately. Whenever I try to merge my branch into the master branch, to pull the new updates it always gets stuck on this window. It seems that merging the branch works for my coworkers as I always ask them to merge my branch for me, but I want to do that by myself to be more productive. I'm not a git expert so I don't know if I am doing something wrong. The process that I'm doing right now to merge my branch is just simply right-clicking the master branch. If you could help me that would be great!1.PNG

1 answer

0 votes
minnsey Atlassian Team Dec 17, 2018

Hi I believe it is a bug in Git-LFS
https://github.com/git-lfs/git-lfs/issues/3358

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,907 views 0 12
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you