On Sat, 24 Dec 2011 06:09:06 +0100, Jonathan Duncan
<jonathan@xxxxxxxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html