#git bot interface
History of !evil_merge
- What you describe _can_ be done, but results in an "evil merge": a commit that purports to be a merge, but does not actually take all changes from all sides. This violates the assumptions that tools and humans make about merges, and usually results in confusion and pain down the road.
By charon at 2013-11-26 08:51:10
- An evil merge is a merge that introduces changes unrelated to the changes being merged.
By jast at 2013-07-30 08:24:52
- An evil merge is a merge that introduces changes that do not appear in any parent.
By ikke at 2013-04-24 08:03:32
- A merge that introduces or removes changes that weren't in the merged branches
By ikke at 2013-04-24 08:02:19