On Mon, Jun 7, 2010 at 14:23, Trans <transf...@gmail.com> wrote:
> I am working on a project with another developer. He was having some
> issues getting things working so he made some changes and pushed them
> up to the master repo. However, his changes were the wrong way to go
> about it. If only a couple of lines were affected I would just pull it
> down and go from there, but the changes touched almost every file --so
> merging the real fix, which I've already have done in my local repo,
> will certainly cause a whole bunch of conflicts. What's the best way
> to go about dropping the latest upstream changes and replacing them
> with my own?
You're probably best off reverting the commit(s) that brought in the
changes you don't want, before merging in your changes. Your merge
will then be able to go forward as though the other changes had never
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at