On Thu, 20 Jan 2022 at 18:12, Gilles Sadowski <gillese...@gmail.com> wrote: > > Hello. > > Every time I run > $ git checkout feature__MATH-1563__genetic_algorithm > $ git rebase master > git signals that it has to do a "3-way merge", that I should run > $ git pull > and this results in having duplicate commits; e.g. these three > commits: > e200f9ccbf85152a973c5f55c2107db39ef068ee > bfe024083458353c5b8c318a1446d274e766f902 > c1ff4e51509776a48fd6345b4f8b7f3f7c3b7a11 > refer to the same changes; and so do these three commits: > 3c5f9d312573d19824b7a5fe433049eee934ad34 > 5148e454a5a2016b2864f9cc6345c4b62d89a321 > 451978b6e9c5c607432001764b3be8bf99934c83 > > Does someone know what prevents git from noticing that > the changes are already part of the branch? > Or how to fix what I'm doing wrong?
I received the standard git message about merge conflicts: git rebase master Auto-merging pom.xml Auto-merging commons-math-examples/pom.xml CONFLICT (content): Merge conflict in commons-math-examples/pom.xml error: could not apply dd36d808e... MATH-1563: Introducing new implementation of GA functionality (WIP). Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". I could resolve them locally and complete the rebase. It was a duplication introducing the <module>examples-ga</module> at the bottom of the pom.xml. I had to resolve the conflict multiple times as there are multiple commits. In the git log I see the same messages repeated many times: 12x: MATH-1563: Introducing new implementation of GA functionality (WIP). 12x: Move GA module declaration to ensure that there are no dependencies on legacy codes. 1x: Add "LICENCE" and "NOTICE" files. Since these messages contain no useful information I suggest squashing the entire set of commits after this rebase to a single commit. I can try this and push to the branch if you want to try that option. Alex --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
