{"thread":{"id":"56821","subject":"Double parent after a merge seems to block the pull from another person","startedAt":"2021-10-31T07:12:11Z","lastAt":"2021-10-31T07:12:11Z","messageCount":1,"participants":["Olivier Paillat"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"440191","messageId":"f3b42a0bdf5b910a65b1d55cb8375a6d284815d0.camel@orange.fr","threadId":"56821","inReplyTo":null,"subject":"Double parent after a merge seems to block the pull from another person","fromName":"Olivier Paillat","fromEmail":"paillat.olivier@orange.fr","sentAt":"2021-10-31T07:12:05Z","receivedAt":"2021-10-31T07:12:11Z","isPatch":false,"sender":{"key":"paillat.olivier@orange.fr","avatar":null},"body":"Hello\n\nI have a question : \nWe are two persons working on the same remote repository\nMy collegue update the remote repository with his ast changes\nMeanwhil I have done a git flow feature that I have finished then I\npulled his last version from the remote repository (git pull origin\ndevelop)\nI had a few merge conflicts that I solved\nThen I did another flow feature and I finally closed this feature and\npush it to origin develop\nMy collegue then try to get the new remote repository but he told me\nthat because there were a double parent in my merge commit (but the\nvery last commit is single parent) he could not get the last version.\nI manage git with comitin QtCreator and git bash command when my\ncollegue use Visual Studio to manage git.\n\nIs it true that a double parent is a problem to get a the last commit\non the remote origin develop ? and in this case how to avoid double\nparent ? or is there something else going on ?\n\nBest regards\n\nOlivier Paillat\n\n"}]}