From: Olivier Paillat <paillat.olivier@orange.fr>
To: git@vger.kernel.org
Subject: Double parent after a merge seems to block the pull from another person
Date: Sun, 31 Oct 2021 08:12:05 +0100 [thread overview]
Message-ID: <f3b42a0bdf5b910a65b1d55cb8375a6d284815d0.camel@orange.fr> (raw)
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
reply other threads:[~2021-10-31 7:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f3b42a0bdf5b910a65b1d55cb8375a6d284815d0.camel@orange.fr \
--to=paillat.olivier@orange.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).