git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Double parent after a merge seems to block the pull from another person

From
OPOlivier Paillat <paillat.olivier@orange.fr>
Date
Oct 31, 2021, 07:12 UTC
Message-ID
<f3b42a0bdf5b910a65b1d55cb8375a6d284815d0.camel@orange.fr>
Hello

I have a question : We are two persons working on the same remote repository My collegue update the remote repository with his ast changes Meanwhil I have done a git flow feature that I have finished then I pulled his last version from the remote repository (git pull origin develop) I had a few merge conflicts that I solved Then I did another flow feature and I finally closed this feature and push it to origin develop My collegue then try to get the new remote repository but he told me that because there were a double parent in my merge commit (but the very last commit is single parent) he could not get the last version. I manage git with comitin QtCreator and git bash command when my collegue use Visual Studio to manage git.

Is it true that a double parent is a problem to get a the last commit on the remote origin develop ? and in this case how to avoid double parent ? or is there something else going on ?

Best regards
Olivier Paillat
Message 1 of 1 in “Double parent after a merge seems to block the pull from another person”
  1. Olivier PaillatOct 31, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.