You have not concluded your merge (MERGE

You have not concluded your merge (MERGE_HEAD exists).

The problem is your previous pull failed to merge automatically and went to conflict state.
And the conflict wasn't resolved properly before the next pull.

1) Undo the merge and pull again.

To undo a merge:

git merge --abort [Since git version 1.7.4]

git reset --merge [prior git versions]

2) pull again

3) Merge again

2) Resolve the conflict properly

3) Don't forget to add and commit the merge.

4) git pull now everything should work fine.

This should fix your problem.

Comments

Extent report plugin for cucumber framework

Extent Reports are the most popular reporting used with Selenium. ExtentReport API makes our life easy to generate interactive report with simple configuartions. It supports almost all Java and .NET test frameworks such as TestNG , JUnit , NUnit etc Here we are discussing about a plugin which is build on Extent Report specially for Cucumber. This plugin is used to simple out the implementation of Extent Report in Cucumber Framework . We are creating a maven project to implement the integration of our plugin with cucumber 1. Create new maven project in any tool eclipse/sts/intellij 2. Open pom.xml and update below entries. Step 1 : Add Cucumber Extent Reporter library to Maven Project Add cucumber-extentsreport <dependency> <groupId> com.vimalselvam </groupId> <artifactId> cucumber-extentsreport </artif...

java: You aren't using a compiler supported by lombok, so lombok will not work and has been disabled.

In order to make projects compile with the existing builds of Lombok processor, as a workaround you can use the flag -Djps.track.ap.dependencies=false which should be added to File | Settings | Build, Execution, Deployment | Compiler | Build process VM options field. This will disable collection of dependencies specified by an annotation processor when Filer methods are called

Execution default of goal org.springframework.boot:spring-boot-maven-plugin:1.2.3.RELEASE:repackage failed: Unable to find main class

Solutions: Solution 1 : You needed to change the packaging parameter to jar from pom. Also, the repositories , pluginRepositories , the maven-compiler-plugin and the spring-boot-maven-plugin's version and executions weren't needed. Solution 2: Try mvn install and see if it works Solution 3: Preview: <properties>  <start-class> com.mycorp.starter.HelloWorldApplication </start-class> </properties> Solution 4: Enable the main() method in your Application.java. Configure spring-boot-maven-plugin to specify the class with the main class (Spring should find it anyway if you have one, but good to be explicit): Preview: <plugin> <groupId> org.springframework.boot </groupId> <artifactId> spring-boot-maven-plugin </artifactId> <version> ${spring-boot-version} </version>...

Error Geek

Search This Blog