Re: "Losing" MERGE_HEAD

2019-05-30 Thread Elijah Newren
On Thu, May 30, 2019 at 9:19 PM Bryan Turner wrote: > > I was looking through the commit history in a repository I work in and > I found a place where someone had created a merge, but somewhere > between "git merge" and "git commit" the fact that it was a merge was > "lost". Instead they ended up

"Losing" MERGE_HEAD

2019-05-30 Thread Bryan Turner
I was looking through the commit history in a repository I work in and I found a place where someone had created a merge, but somewhere between "git merge" and "git commit" the fact that it was a merge was "lost". Instead they ended up with a really big commit that applied all the changes from the