conflict handling

  • Conflict handling in Git

    Conflict handling in Git

    jerry is working on the wchar_support branch. he changes the name of the feature and after checking, he repository his changes.
  • Different Platforms in Git

    Different Platforms in Git

    gnu / linux and mac os use line-feed (lf), or a new line when line-ending characters while windows uses line-feed combination and carriage-return (lfcr) to signify the ending of the character line ends.
  • Conflict handling in Git

    Conflict handling in Git

    jerry is working on the wchar_support branch. he changes the name of the feature and after checking, he repository his changes.