3

Possible Duplicate:
How do I fix merge conflicts in Git?

I made a change in dev branch and commited the change.

To then swisted to master and tried a merge.

Switched to branch 'master'
root@li494-175:/home/ubuntu/workspace/rtbopsConfig# git merge --no-ff development
Auto-merging rtb_settings/rtb_settings.yaml
CONFLICT (content): Merge conflict in rtb_settings/rtb_settings.yaml
Automatic merge failed; fix conflicts and then commit the result.

I dont know what this means. I Tired to swtick bakc to master and I get this error.

root@li494-175:/home/ubuntu/workspace/rtbopsConfig# git checkout development
rtb_settings/rtb_settings.yaml: needs merge
error: you need to resolve your current index first

I just dont get this at all. How do I resolve?

Community
  • 1
  • 1
Tampa
  • 75,446
  • 119
  • 278
  • 425
  • Open the referenced file in a merge tool or a text editor. You should find merge markers `<<<<>>development` or similar where merging failed - you will need to edit those fragments to the desired result, add and commit them. Did you consult any documentation before asking? – DCoder Sep 02 '12 at 10:19
  • That post sovled my problem. Thanks – Tampa Sep 02 '12 at 10:31

0 Answers0