Home GIT different merge result with different GIT versions
Reply: 0

GIT different merge result with different GIT versions

user1625
1#
user1625 Published in July 21, 2018, 1:48 pm

Runnning merge command on different GIT versions we have different result:

Command is: git merge --no-ff origin/master_codeline

Results:

  • Version 2.1.4 -> Merge succeded
  • Version 1.7.1 -> The same merge command on the same commit return conflicts (CONFLICT (rename/add))

Now it would be easy to just update the GIT version on the OS but the 1.7.1 is the latest working version supported by our OS (Linux 2.6.34.10-0.2-xen SMP 2011-07-20 GNU/Linux, openSUSE 11.3 (x86_64) VERSION = 11.3) and we can't update the OS cause we have some constraint.

I was wondering if anyone ever experienced this kind of issues and if eventually there are way to workaround it, maybe tuning the GIT default merge options.

The conflicts output is:

CONFLICT (rename/add): Rename src/test/resources/env/env_branch2_jboss.prop->src/test/resources/env/dev2.prop in HEAD. src/test/resources/env/dev2.prop added in origin/master_codeline
Adding as src/test/resources/env/dev2.prop~origin_master_codeline instead
CONFLICT (rename/add): Rename src/test/resources/env/jboss.properties->src/test/resources/env/dev3.prop in HEAD. src/test/resources/env/dev3.prop added in origin/master_codeline
Adding as src/test/resources/env/dev3.prop~origin_master_codeline instead
Automatic merge failed; fix conflicts and then commit the result.

Unfortunately the VM where we are having these issues is our automation machine, and we run most of our merge operation on that VM.

You need to login account before you can post.

About| Privacy statement| Terms of Service| Advertising| Contact us| Help| Sitemap|
Processed in 0.308775 second(s) , Gzip On .

© 2016 Powered by mzan.com design MATCHINFO