Perform the following steps to merge the known conflicts:
- In the jgit repository folder, start by checking out a branch that tracks origin/stable-2.2:
$ git checkout -b rerereExample --track origin/stable-2.2
- Now, change the maven-compiler-plugin version to something personalized, such as 2.5.2, as this is in line 211 in pom.xml. If you run git diff, you should get a result very similar to the following:
$ git diff diff --git a/pom.xml b/pom.xml index 085e00f..d5aec17 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </plugin> <plugin>
- Now add the file and create a commit:
$ git add pom.xml $ git ...