From: Gelonida N <gelonida@gmail.com>
To: git@vger.kernel.org
Subject: Re: Git: Unexpected behaviour?
Date: Fri, 11 Nov 2011 22:25:03 +0100 [thread overview]
Message-ID: <j9k3rg$i72$1@dough.gmane.org> (raw)
In-Reply-To: <1321045782702-6986770.post@n2.nabble.com>
On 11/11/2011 10:09 PM, Jvsrvcs wrote:
> The thing is that I want my 'master' branch' to reflect what is in the
> 'master' repo - we are using another versioning control system than git for
> the master for the moment.
>
> I want to be able to switch to the master at any moment, do an update there
> with the primary versioning system in use, and get all others commits and
> merge down to my branch from time to time.
>
> It seems to me that this behaviour corrupts the master branch, reflecting a
> change in the master branch that I did not want or expect.
>
> so I suppose the correct work flow would to be *ALWAYS*, commit on the
> branch you are on before switching to another branch? I think this would
> solve the problem.
You can look at
git stash
>
> This just seems a bit odd. I did not commit on the branch, I switched and
> it's on the master now. At any rate, I can work with it, just need to know
> the correct work flow I should take before switching to another branch, and
> that seems to be *ALWAYS* commit before switching to get the expected
> behaviour that seems normal to me.
>
> --
> View this message in context: http://git.661346.n2.nabble.com/Git-Unexpected-behaviour-tp6986736p6986770.html
> Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2011-11-11 21:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 20:55 Git: Unexpected behaviour? Jvsrvcs
2011-11-11 21:03 ` Carlos Martín Nieto
[not found] ` <CAPZPVFb-VbTfkuyg4KtTsaWiNvd37GHeH7crPtqv1fKRbwuyfQ@mail.gmail.com>
2011-11-11 21:04 ` Eugene Sajine
2011-11-11 21:09 ` Jvsrvcs
2011-11-11 21:14 ` Taylor Hedberg
2011-11-11 21:25 ` Gelonida N [this message]
2011-11-11 21:31 ` Chris Packham
2011-11-12 0:24 ` J.V.
2011-11-12 8:25 ` Chris Packham
2011-11-12 19:37 ` Junio C Hamano
2011-11-14 17:20 ` Martin von Zweigbergk
2011-11-14 20:55 ` Junio C Hamano
2011-11-14 21:33 ` Jakub Narebski
2011-11-12 8:32 ` Alexey Shumkin
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='j9k3rg$i72$1@dough.gmane.org' \
--to=gelonida@gmail.com \
--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.
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).