i've an issue regarding bitbucket when i am trying to merge the go i am facing this issue..
After "PULL REQUEST"
I got an issue
src/main/webapp/css/main.css (conflicts) the code is fine in Eclipse but in Bitbucket view its showing 2 more lines added in code having some text. like
and i am unable to merge the code...
Please help me :(
It started as any story starts, on a normal, rainy day. Admin meets App, and her name was Klok2, and like any first relationship we were both trying to make it work but neither one knew what...
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