From: Albert ARIBAUD <albert.aribaud@free.fr>
To: u-boot@lists.denx.de
Subject: [U-Boot] merge conflicts during git pull
Date: Mon, 14 Feb 2011 11:07:00 +0100 [thread overview]
Message-ID: <4D58FEC4.3040600@free.fr> (raw)
In-Reply-To: <4D58F04F.3080001@matrix-vision.de>
Le 14/02/2011 10:05, Andre Schwarz a ?crit :
> Wolfgang,
>
>
> ....
>>> Have I missed anything ?
>>> Is there a way to get automagically merged whatever there might be to
>>> merge ?
>> Sorry, I have no idea what happenend of your system. I can see no
>> issues on our side.
>
> thank - will clone a new repo an pull in my local branches.
Just a side note: I tend to prefer git fetch over git pull, because I am
sure that I don't affect my working branch unless I really want to, at
which point I do it voluntarily and in a controlled manner, through git
rebase or git merge, and even then, I often tag my branch beforehand so
that I cen easily double-check the actions and revert them as/if needed.
Amicalement,
--
Albert.
prev parent reply other threads:[~2011-02-14 10:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-11 15:30 [U-Boot] merge conflicts during git pull Andre Schwarz
2011-02-11 19:13 ` Wolfgang Denk
2011-02-14 9:05 ` Andre Schwarz
2011-02-14 10:07 ` Albert ARIBAUD [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D58FEC4.3040600@free.fr \
--to=albert.aribaud@free.fr \
--cc=u-boot@lists.denx.de \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox