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?

Thanks,
Gilles

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to