From: "Frans Klaver" <fransklaver@gmail.com>
To: git@vger.kernel.org, "Jonathan Duncan" <jonathan@memoryties.com>
Subject: Re: Wrong code on master
Date: Sat, 24 Dec 2011 06:49:29 +0100 [thread overview]
Message-ID: <op.v6zbsrvi0aolir@keputer> (raw)
In-Reply-To: <36BFCDA4-8249-4965-877F-FFC9EA65C7EE@memoryties.com>
On Sat, 24 Dec 2011 06:09:06 +0100, Jonathan Duncan
<jonathan@memoryties.com> wrote:
> I have a developer that committed code that should have been on a
> branch. I have created a branch now and locally my master branch is
> good to go. However, when I try to push it conflicts, of course,
> because the repo still wants me to pull the changes and merge them to my
> master.
>
> The new code from the other developer will eventually be used, but we
> were not ready for it to be on "master" yet. I need to push my own code
> out before that other code gets used.
>
> Will I really have to pull and merge the code to master and then
> revert? I have been googling all day, trying to figure out the best way
> to do this and in the process I fear I have made a mess of my repo. I
> have been using git long enough to be dangerous to myself.
Well, the proper way is to revert the commits. That won't result in all
other developers having to deal with a force-updated branch. If you can
deal with it you can always
$ git push origin +branch
but I wouldn't consider that a nice thing to do.
next prev parent reply other threads:[~2011-12-24 5:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-24 5:09 Wrong code on master Jonathan Duncan
2011-12-24 5:49 ` Frans Klaver [this message]
2011-12-24 6:37 ` Jonathan Duncan
2011-12-24 15:42 ` Nathan W. Panike
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=op.v6zbsrvi0aolir@keputer \
--to=fransklaver@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathan@memoryties.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