git - How do I add a repository to another repository? -



git - How do I add a repository to another repository? -

yesterday created github repository , today found out advisor created github repository. best way add together repository repository without massively screwing things up? have massively screwed things in past want create sure. may have screwed things trying follow instructions on stackoverflow post.

right seems have 2 branches, , typing "git checkout master" gives me files, while typing "git checkout tmp_branch" gives me files. i'd add together files repository , utilize 1 on, , maybe delete repository.

so far i've tried is

me@server:~/rootdir$ git remote add together origin https://github.com/him/his_repo.git fatal: remote origin exists. me@server:~/rootdir$ git remote add together his_repo https://github.com/him/his_repo.git me@server:~/rootdir$ git force -u his_repo master username 'https://github.com': me@gmail.com password 'https://me@gmail.com@github.com': https://github.com/him/his_repo.git ! [rejected] master -> master (non-fast-forward) error: failed force refs 'https://github.com/him/his_repo.git' hint: updates rejected because tip of current branch behind hint: remote counterpart. merge remote changes (e.g. 'git pull') hint: before pushing again. hint: see 'note fast-forwards' in 'git force --help' details. me@server:~/rootdir$ git pull his_repo username 'https://github.com': me@gmail.com password 'https://me@gmail.com@github.com': warning: no mutual commits remote: counting objects: 13, done. remote: compressing objects: 100% (10/10), done. remote: total 13 (delta 0), reused 10 (delta 0) unpacking objects: 100% (13/13), done. https://github.com/him/his_repo * [new branch] master -> his_repo/master asked pull remote 'his_repo', did not specify branch. because not default configured remote current branch, must specify branch on command line. me@server:~/rootdir$ git checkout -b tmp_branch his_repo/master warning: unable rmdir mysubdir: directory not empty branch tmp_branch set track remote branch master repo. switched new branch 'tmp_branch' me@server:~/rootdir$ git checkout -b origin/master switched new branch 'origin/master' me@server:~/rootdir/subdir$ git checkout -b master fatal: branch named 'master' exists. me@server:~/rootdir/subdir$ git checkout master checking out files: 100% (2409/2409), done. switched branch 'master' me@server:~/rootdir$ git checkout tmp_branch warning: unable rmdir mysubdir: directory not empty switched branch 'tmp_branch' me@server:~/rootdir$ git mv * tmp_branch/* fatal: destination 'tmp_branch/*' not directory me@server:~/rootdir$ cd .. me@server:~/rootdir$ git checkout master checking out files: 100% (2409/2409), done. switched branch 'master' me@server:~/rootdir$ git force -u tmp_branch master fatal: 'tmp_branch' not appear git repository fatal: remote end hung unexpectedly me@server:~/rootdir$ git force -u his_repo master username 'https://github.com': me@gmail.com password 'https://me@gmail.com@github.com': https://github.com/him/his_repo.git ! [rejected] master -> master (non-fast-forward) error: failed force refs 'https://github.com/him/his_repo.git' hint: updates rejected because tip of current branch behind hint: remote counterpart. merge remote changes (e.g. 'git pull') hint: before pushing again. hint: see 'note fast-forwards' in 'git force --help' details.

thanks much :)

to create advisor’s repository contain files, , forget repository:

add repository remote check out new local branch tracks master branch make new commit on branch replaces files yours push branch remote remove old remote local repository (and delete on remote server if want)

in log of shell commands, got steps 1 , 4 working. step 4 failed because didn’t steps 2 , 3. when tried force commit history remote in step 4, on branch of old repository, had different history. git refused because overwriting of history history. prepare that, start history checking out branch, , add together new commit history replaces files yours.

i haven’t memorized exact git commands of above – utilize gui – here know each step:

git remote add together his_repo https://github.com/him/his_repo.git git branch branch_for_his_work his_repo/master, followed git checkout --merge branch_for_his_work. switch branch tracks repo, , --merge means instead of overwriting files working re-create files, git start three-way merge. to overwrite files yours, resolve merge files staged, , none of his. git commit …. git force … git remote remove origin, , git remote rename his_repo origin if want phone call remote “origin” instead of “his_repo”. git branch -m branch_for_his_work master “master” branch, , refers advisor’s history.

steps 2 , 3 bit harder need because don’t know of flag git checkout means “leave working re-create – alter git’s head”. if there such flag, git add together -a , git commit in step 3, without having deal merge conflicts. or re-create files out before steps 2 , set them before step 3, uses more disk space, simpler, much manual solution said used.

git github

Comments

Post a Comment

Popular posts from this blog

xslt - DocBook 5 to PDF transform failing with error: "fo:flow" is missing child elements. Required content model: marker* -

xslt - DocBook 5 to PDF transform failing with error: "fo:flow" is missing child elements. Required content model: marker* - i've inherited doc publishing process takes docbook , builds html , pdf output, using apache fop both. project had been started, never completed. lots of tweaking, i've able of doc sets build (20+), except handful, , fail severe code 1 of these 2 conditions: "fo:flow" missing kid elements. required content model: marker* "fo:block" not valid kid of "fo:root" the xml output comes out of docbook , docbook-fop checks out well-formed. the fop error in 1 book, "endecagloss", example, points end of string: <fo:flow flow-name="xsl-region-body" start-indent="4pc" end-indent="0pt"/> here’s log output in case: [java] severe: javax.xml.transform.transformerexception: file:/scratch/publishing/hudson/jobs/build-main-endeca-documentation/workspace/serverdoc/w...
Read more

mediawiki - How do I insert tables inside infoboxes on Wikia pages? -

mediawiki - How do I insert tables inside infoboxes on Wikia pages? - i want insert tables in infoboxes. example, have proteinbox i've developed using infobox template (http://health-and-medicine.wikia.com/wiki/template:proteinbox), , fasta field big fit comfortably in proteinbox. hence collapsible table within box. this tried: {{infobox | row 1 = {| class = "mw-collapsible mw-collapsed wikitable" |- | <!-- table content --> |} }} your problem is, putting nested table within template. pipe characters ( | ) in table syntax collides pipe usage in templates. the commonly used hack around create template called template:! , containing pipe character, , utilize when need set tables, parser functions or other stuff using pipe characters, within templates. table (with every | replaced {{!}} ): {{{!}} {{!}}- {{!}} a1 {{!}} b1 {{!}}- {{!}} a2 {{!}} b2 {{!}}} ...the equivalent of {| |- | a1 | b1 |- | a2 | b2 |} furthermore, hav...
Read more

Local Service User Logged into Windows -

Local Service User Logged into Windows - i created windows service tracks app server user connected through load balancer. it retrieves user logged windows on machine, cross references active directory (ad) business relationship homecoming first name, lastly name , e-mail (for notification through website created project) there 1 scheme on network users remote system, vista system, reason returning values "local service" logged machine, it's weird , security guys impossible "local service" business relationship logged windows. here how user logged windows managementscope ms = new managementscope("\\\\.\\root\\cimv2"); objectquery query = new objectquery("select * win32_computersystem"); managementobjectsearcher searcher = new managementobjectsearcher(ms, query); foreach (managementobject mo in searcher.get()) { _username = mo["username"].tostring(); } // remove domain part username string[] usernameparts = _...
Read more