we have Stash running in Production.
Recently we are facing issue that merge button is disabled in Stash(it shows conflicts even though there are no conflicts).
Please help me out in resolving this Issue. Many developers are facing issue in merging the pull request because of this.
Atlasian ticket has been raised, but didnt get resolution from them. please help me out.
Quick reply is appricated.
One reason for "changes, where obviousliy are none" usually is line ending conversion during git operations. This depends on your git-setting
As it's quite complex to explain - and exhaustingly discussed already, I would recommend googling for "autocrlf" ...
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs