Trying to use Git with Android Studio -


with friend long time trying work git , android studio, had problem (we new git , android studio, started couple of days ago on both issues).

what happens that, example, if cloned git repository , try make merge, button execute grayed out , doesn't let me compile or run it, if display project structure android or packages see nothing, can see files in project, project files, recent changes, etc...

i explain in detail we've done.

first, repository looks (p , c initials).

  x (c)  / x (master)  \   x (p)

master has first initial commit .gitignore , readme.md, nothing more, while (me created branch p, , friend created branc c) have 1 commit each 1 executable projects, although i'm not interested in joining i've done friend has done, want start new project of android studio friend has made.

so start android studio, "check out project version control -> github", put key , choose repository want clone, after ask me if want create new project , click yes.

enter image description here

enter image description here

i hit next until new project created , here can see branches have created on github.

enter image description here

after make local branch try work project of friend, option "git branches -> new branch" , calling p, moves me local branch automatically.

after that, choose merge option of remote branch origin/c, , merge failure, says "some untracked working tree files overwritten merge. please move or remove them before can merge.", choose option view files , shows me these.

enter image description here

since project new, , project friend uploaded worked fine him, deleted these files red bar mouse pointing , after message appears says there no difference now.

finally, after that, go again merge option of remote branch c, , conflict message appears, on .gitignore file, in case put "accept theirs", , see message merge correctly.

enter image description here

and when see button execute grayed , if display project structure android see nothing, can see files in project, project files, etc...

enter image description here

i think should super basic i'm asking, (me , friend) had never worked git or android studio , asked make project using them.

this because have added .idea folder in git repository.sample .gitignore file can this

build/  .gradle/  *.iml .idea/ src/main/gen/*  *~ *.swp  local.properties  *.keystore *.keystore.password

also need delete folder git repo. can use below command

git rm -rf .idea/ git commit -m "deleting .idea, updated .gitignore"

then try merge


Comments

Post a Comment

Popular posts from this blog

Magento/PHP - Get phones on all members in a customer group -

i working on custom magento extension. working around adminhtml part , i've created custom form there. here form code: <?php class vivasindustries_smsnotification_block_adminhtml_sms_sendmass_edit_form extends mage_adminhtml_block_widget_form { public function _preparelayout() { $extensionpath = mage::getmoduledir('js', 'vivasindustries_smsnotification'); $head = $this->getlayout()->getblock('head'); $head->addjs('jquery.js'); $head->addjs('vivas.js'); return parent::_preparelayout(); } protected function _prepareform() { $form = new varien_data_form(array( 'id' => 'edit_form', 'action' => $this->geturl('*/*/save', array('id' => $this->getrequest()->get...
Read more

php - Bypass Geo Redirect for specific directories -

i'm trying bypass redirect specific url within site. wondering if might able help. the code below code use, original urls replaces example.com i'd able access http://example.com/admin without redirect occuring. is there way this, , there way using own ip? function country_geo_redirect() { $country = getenv('http_geoip_country_code'); if ($country == "us" ) { wp_redirect("http://usa.example.com/"); exit; } else if ($country == "gb" ) { wp_redirect("http://uk.example.com/"); exit; } } add_action('init', 'country_geo_redirect'); you can bypass redirection code if server found ip address. if ip address == <my ip address> ' nothing here else country_georedirect() end if
Read more

php - .htaccess mod_rewrite for dynamic url which has domain names -

i want convert url ex:( example.com/link.php?url=facebook.com ) ( example.com/facebook.com.php ) how can using .htaccess. or there other process make job easier ? i tried adding script .htaccess file options +followsymlinks rewriteengine on rewriterule url-(.*)\.htm$ link.php?url=$1 but converting url adding "url-" ( example.com/url-facebook.com.php ) i want remove "url-" , want make ( example.com/facebook.com.php ) rewriteengine on rewritecond %{the_request} ^get.*link\.php\?url\= [nc] rewritecond %{request_uri} !/system/.* [nc] rewriterule (.*?)link\.php\?url\=/*(.*) /$1$2 [r=301,ne,l] not sure how above work edit of used use remove index.php url
Read more