On Thursday, August 9, 2012, THUFIR HAWAT wrote:
> I think that I do want to zap the master branch; git reset --hard origin
will delete everything in origin, or just everything in master on origin?
In this case, I'm using github.
'git reset' always affects the branch you have checked out, not any
On Thursday, 9 August 2012 00:29:20 UTC-7, Peter J Weisberg wrote:
>
> On Wed, Aug 8, 2012 at 10:53 PM, THUFIR HAWAT
> >
> wrote:
> > I get conflicts when trying to merge: https://gist.github.com/3301009
> >
> > What I want to do is to take commit x to branch 4 and put it "ontop"(?)
> of
On Wed, Aug 8, 2012 at 10:53 PM, THUFIR HAWAT wrote:
> I get conflicts when trying to merge: https://gist.github.com/3301009
>
> What I want to do is to take commit x to branch 4 and put it "ontop"(?) of
> commit y on branch "master." Is that not a merge?
>
> What does it matter when there's a c
I get conflicts when trying to merge: https://gist.github.com/3301009
What I want to do is to take commit x to branch 4 and put it "ontop"(?) of
commit y on branch "master." Is that not a merge?
What does it matter when there's a conflict, isn't that the very meaning of
merge, that you are sa
