github - Git: move local project into other repo, keeping history -

-

i need somehow move existing maven project under version control git, inside git repo project resides.

why? in past few weeks, worked on project on own. use git locally (there no remote repository!) track changes. basic structure on side this:

myrepo   |--.git   |--myproject   |--.gitignore

where myproject maven project.

meanwhile, colleague of mine created repo himself, maven, project in it. repo remote, on github. structure looks this:

commonrepo   |--.git   |--hisproject   |--.gitignore   |--pom.xml   |--.project   |--.settings

so can see, idea there parent pom in repo specifies modules. hispoject 1 of these modules.

i want move myproject there, maven module. don't want lose commit history in process. want final structure like:

commonrepo   |--.git   |--hisproject   |--myproject   |--.gitignore   |--pom.xml   |--.project   |--.settings

i found approaches move 1 directory repo, seems none of these fit problem. looks solutions require myrepo have remote , pull commonrepo , merge.

so, how possible accomplish want?

assuming myrepo , commonrepo accessible same machine, following:

cd /path/to/commonrepo git remote add -f other_repo /path/to/myrepo git merge other_repo/master  # following commands need executed if there conflicts. # description suggests conflict may in .gitignore. # run these commands after resolving conflicts manually. git add . git commit -m "merged myrepo" # end of commands needed in case of conflicts  git remote remove other_repo

Comments

Post a Comment

Popular posts from this blog

java - Suppress Jboss version details from HTTP error response -

-
my jboss verson jboss eap 6.3 when kind of error response sent jboss, adds server information response. following sample row response: http/1.1 400 bad request server: apache-coyote/1.1 content-type: text/html;charset=utf-8 content-length: 2391 date: tue, 19 jul 2016 09:30:46 gmt connection: close jboss web/7.4.8.final-redhat-4 - jbweb000064: error report jbweb000065: http status 400 - org.codehaus.jackson.map.jsonmappingexception: can not construct instance of mybean.type string value 'xyz': value not 1 of declared enum instance names @ [source: org.jboss.resteasy.core.interception.messagebodyreadercontextimpl$inputstreamwrapper@5e421c2b; line: 14, column: 26] (through reference chain: requestargs["request"]) jbweb000309: type jbweb000067: status report jbweb000068: message org.codehaus.jackson.map.jsonmappingexception: can not construct instance of mybean.type string value 'xyz': value not 1 of declared enum instance names @ [source: org.jboss...
Read more

gridview - Yii2 DataPorivider $totalSum for a column -

-
i have order , ordersearch models. in order list (actionindex) gridview there filtering , sorting. on of columns in order order_total (sum of products in order). i need implement sum of order_total in gridview. if manually counting activedataprovider->getmodels() array_map spend 3 seconds 3000 orders (localhost). don't want miss time. i see 2 ways make faster: create cache every filter , update lifetime (horrible) the interesting can right in ordersearch->search() method $query method. don't understand how can pass in controller. example of code 2nd way: class ordersearch extends order { public $totalsum; public function search($params) { $query = order::find(); $dataprovider = new activedataprovider([ 'query' => $query, ]); $this->load($params); $this->totalsum = $query->sum('order_total'); // works fast return $dataprovider; } } after i...
Read more

Sass watch command compiles .scss files before full sftp upload -

-
i use winscp download , edit .scss files , sass on linux (on server) compile them .css . after saving file, use: sass scss/style.scss css/style.css , replaces css file compiled sccs. the problem i want skip part return command line after editing scss file, sake of automation , saving time. but, if use watch command: sass --watch scss/style.scss:css/style.css synchronize 2 files, alerts nonexistent css errors pop up: change detected to: scss/style.scss error scss/style.scss (line 232: invalid css after "...ht: bold; line-": expected "{", "") note that when file uploads quicker usual (sometimes happens) watch command job, no errors. this because, when file upload takes time, sass compiles scss file (on server) before uploaded remote folder. thus, compiles part of file, resulting in css errors. is there way set timer watch command waits few seconds after detects changes , before compiling? any other way overcome is, of course, ...
Read more