DD3Boh

First go here:

        https://wiki.codeaurora.org/xwiki/bin/QAEP/release

This site gives information about all msm soc release details with tag + android version

Search your msm here.. Check the latest one and look for correct android version and mark that tag.

Now open one of the following links (dependent on your linux kernel version)

ccannon94

Resolving Merge Conflicts

Sometimes, especially if you work on your project from multiple computers, you will experience a merge conflict when you attempt to sync with your remote.

Merge conflicts are a totally normal part of source control management, and resolving them is quite simple.

• Whether you are resolving the merge conflict on the GitHub desktop app or on the Remote (using the website), the process is quite simple.
• First, examine the two versions of the file below. Notice that both have different changes on the same line. One was edited in Netbeans, and the other from the GitHub website.

karenyyng

Table Of Content

Skip to the relevant sections if needed.

• 2-min tutorial to do it the quick-and-dirty-way
• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
  • Resolving conflict from a Git pull
• Other great references and tutorials

huqi

Beyond Compare 4
Licensed to:    ASIO Allsoftinone
Quantity:       1 user
Serial number:  1822-9597
License type:   Pro Edition for Windows

--- BEGIN LICENSE KEY ---
H1bJTd2SauPv5Garuaq0Ig43uqq5NJOEw94wxdZTpU-pFB9GmyPk677gJ
vC1Ro6sbAvKR4pVwtxdCfuoZDb6hJ5bVQKqlfihJfSYZt-xVrVU27+0Ja
hFbqTmYskatMTgPyjvv99CF2Te8ec+Ys2SPxyZAF0YwOCNOWmsyqN5y9t

brandonbloom

#
# ADDITIONAL_DEFAULT_PROPERTIES
#
ro.secure=0
ro.allow.mock.location=1
ro.debuggable=1
persist.service.adb.enable=1
# begin build properties
# autogenerated by buildinfo.sh
ro.build.id=GWK74