Git and DiffTool problems : What do LOCAL and REMOTE point to?

by

there are 4 components to this (note that before this step, you would have already done a local-checkin.)

  • The local-checkin that your git tree has: LOCAL
  • The head of the remote repository (that is going to be merged): REMOTE
  • common ancestor to both LOCAL and REMOTE: BASE
  • The file that will be written as a result: MERGED.

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)