scipy/scipy — comment on commit 11c2ea4733769130c1a86ad9fcfc81c741b82e5e
File:  line 0
By teoliphant:

This was developed in my "fork" (but master). I've realized now that is a problem. I thought having my own "fork" was good enough.

Source Tree has a pretty good graph, but I don't know what I am supposed to be seeing, necessarily. I guess, what you would like to see is a clean branch that breaks off once and gets merged back in once? If there are conflicts during the merge, how does that work?

Thanks,

-Travis

On Feb 6, 2012, at 1:13 PM, Charles Harris wrote:

> I don't see any indication that this was developed in a branch, so that might be the problem. Travis, *all* work should be done in a branch, even changing a comma. Master should only be used for merging branches and must be kept up to date with upstream. always do git log --graph after you do the merge and before pushing upstream, and if things don't look right, git reset --hard ORIG_HEAD, then repeat until you get it right ;)
>
> ---
> Reply to this email directly or view it on GitHub:
> https://github.com/scipy/scipy/commit/11c2ea4733769130c1a86ad9fcfc81c741b82e5e#commitcomment-937785