Ok so i manually solved ALL conflicts and the file list shows that there are no conflicts.
as you can see here http://prntscr.com/8j3j14
but the button merge shows there is a conflict, but in reality there is none. There just isnt, everything should just work, but doesnt.
Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda ...
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot