While working on a feature branch, you probablylike to merge daily or perhaps more often, but when you work on long-living feature branches, you end up in a situation where you have the same conflicts occurring repeatedly.
Here, you can use git rerere
, which stands for reuse recorded resolution. Gitrerere is not enabled by default, but can be enabled with the following command:
$ git config rerere.enabled true
Perform the following steps to merge the known conflicts:
- In the
jgit
repository folder, start by checking out a branch that tracksorigin/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 rungit diff
, you should get a result very similar to the following:
$ git diff
diff --git a...