1. error Your local changes to the following files would be overwritten by merge

    error Your local changes to the following files would be overwritten by merge

    2
  2. Defining local variable in Makefile target

    Defining local variable in Makefile target