While merging code I got some conflict error in bitbucket

问题

While merging code in GIT (Bitbucket), 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

<<<<<<< destination:f27cd37fb7008c0d18f63514ca44ceacbaa3c658

and

>>>>>>> source:95de515e0203585db3c4f1084e37ade6dcc08ed2

回答1:

1. Take a backup of your changes
2. Override and update (or Revert) your local file with the latest on Git
3. Apply your changes again
4. Try to commit and push

来源：https://stackoverflow.com/questions/23356440/while-merging-code-i-got-some-conflict-error-in-bitbucket