43

Best : learning git

Worst : couldn't solve merge conflicts in git

Comments
  • 1
    Practice makes perfect. 😳 Make more conflicts to solve.
  • 0
    @illusion466 I recently hit with a merge conflict which was caused due to .idea folder and it's contents

    I added that folder to .gitignore but still can't figure out it resolve it...
  • 1
    @CurseMeSlowly that's a bitter sweet and slow death...
  • 0
    @illusion466 so after adding .gitignore I should git add -A and then commit?
  • 0
    @illusion466 so you must gitignore before adding files and folders?? That's really confusing
Add Comment