From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Thomas Adam <thomas.adam22@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Workflow question: A case for git-rebase?
Date: Wed, 8 Aug 2007 22:47:50 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708082246370.21857@racer.site> (raw)
In-Reply-To: <18071eea0708081411p41eaa44ai105adaef0e4b10a5@mail.gmail.com>
Hi,
On Wed, 8 Aug 2007, Thomas Adam wrote:
> As for myself, I maintain _locally_ a few branches (branchX, branchY)
> which dictate some bits and pieces I'm working on. Periodically, I
> will tend to merge either merge to master and then push those changes
> out. So far so good...
>
> But, I've now come up against a case whereby if one of my colleagues
> changes a file (call it fileA) in branch master, and, in the course of
> my working in branchX means i modify fileA also, when I come to merge
> branchX into master I find the original change in master (as submitted
> by my colleague) being reverted by my changes in branchX.
I have a hard time seeing that. If you touch the same code,
unidentically, merge-recursive will not be nice to you: it will show
conflicts, and you have to resolve them.
Or do you use "-s ours"?
Ciao,
Dscho
next prev parent reply other threads:[~2007-08-08 21:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-08 21:11 Workflow question: A case for git-rebase? Thomas Adam
2007-08-08 21:47 ` Johannes Schindelin [this message]
2007-08-08 21:56 ` Thomas Adam
2007-08-09 20:30 ` Jan Hudec
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=Pine.LNX.4.64.0708082246370.21857@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=thomas.adam22@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).