GitHub putting junk in my code?

Question

I opened my Android app code today (which is stored on GitHub), and I noticed a bunch of generated junk that looks like this:

import android.graphics.BitmapFactory;
import android.util.Log;
<<<<<<< HEAD
import android.view.Menu;
import android.widget.ImageView;
=======
import android.view.View;
import android.widget.Button;
>>>>>>> 644f9ed0b1244dfd51590ba98bcd9dcf8f9c89e4
import android.widget.RemoteViews;
import android.widget.Toast;

How did that get there? Was it Eclipse? GitHub? How can I prevent this?

You have missed some `merge` messages when you pushed. – keyser Aug 18 '13 at 11:02 — keyser, Aug 18 '13 at 11:02

score 2 · Accepted Answer · edited May 23 '17 at 12:08

2

This is not junk and has been done by GIT. You would have done some merging of the code and there might have been conflicts. Those are merge conflicts. See the explanation here: GIT corrupt files (<<<<<<<<HEAD) . You can also resolve then manually.

edited May 23 '17 at 12:08

Community

1
1

answered Aug 18 '13 at 11:01

Shobhit Puri

25,769
11
95
124

GitHub putting junk in my code?

1 Answers1