Egit pull and merge changes

Vote count:

0

I was working locally on master branch. (by mistake) but it's ok with me this time as I control my code.

I took the following steps:

1. Egit->commit and push (to master)


2. Egit -> pull (to get other developers changes)


3. I got a message that there is a conflict with one file and I merged it.


4. Now I see: [My Product | Merged Master (up arrow)2 (down arrow)1]


5. I see in the symbols next to the files that the other developers created - black sign as if there are uncommitted.

A. What does the 2 up arrow and 1 down arrow mean? B. Why do I see uncommitted changes? they are not mine C. How can I work out on master after my merge?

I know that I am supposed to work on branches - but for now - how do I fix the situation?

asked 57 secs ago

Dejel

3,279

Egit pull and merge changes