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!
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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