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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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
Atlassian Team members are employees working across the company in a wide variety of roles.
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
AUG Leaders

Atlassian Community Events