Git : Confuse after merge

Question

I am new to git. Recently, I merged some code from feature to master branch. After merging my .gitignore file looks like this

<<<<<<< HEAD
gen/
bin/
=======
gen/
>>>>>>> master

Now my question is

If I want to change content of that file, should I follow any special instruction or just normally I can change the file and commit ?
What are the meaning of those sign <<<<<<< HEAD >>>>>>> master ?
If I remove head and master from the file. Will it generate any error ?

BTW, If I'm not wrong you merge feature to master, not master to feature now. — RiaD, Jul 17 '13 at 12:13

score 1 · Accepted Answer · answered Jul 17 '13 at 12:06

1

It shows what was in your current HEAD, and what was in the master branch.

If you want to choose what was in the HEAD you should leave only

gen/
bin/

in that file. If you decide to choose what was in master you should ahce only

gen/

in that file.

You also may need to write here anything else. After merge this file will look like you commit it now.

I believe it's no practical case when you will not deleted special lines as

=======

answered Jul 17 '13 at 12:06

RiaD

Sorry, I didn't get the last line. Will you please describe. – user2579475 Jul 17 '13 at 12:07
@user2579475, I believe it's easier to understand now – RiaD Jul 17 '13 at 12:10

1 Answers1