eclipse - How to merge my local project with a github project? -



eclipse - How to merge my local project with a github project? -

some months ago, downloaded github project (https://github.com/unidata/thredds) in order adapt parts of code , develop in eclipse (the creators develop project in intellij) , downloaded zip file, hence didn't clone repo.

on other hand, local project out of date , update local project through github original project.

edit:

my project folder includes .gitignore folder not include .git folder there no reference master/original

i've done this:

$ git init $ git remote add together upstream https://github.com/unidata/thredds.git $ git fetch upstream remote: counting objects: 172902, done. remote: compressing objects: 100% (54837/54837), done. remote: total 172902 (delta 106502), reused 172153 (delta 106046) receiving objects: 100% (172902/172902), 813.46 mib | 1.70 mib/s, done. resolving deltas: 100% (106502/106502), done. https://github.com/unidata/thredds * [new branch] 17gridfc -> upstream/17gridfc * [new branch] 4.5.0 -> upstream/4.5.0 * [new branch] 4.5.1 -> upstream/4.5.1 * [new branch] 4.5.2 -> upstream/4.5.2 * [new branch] d4test -> upstream/d4test * [new branch] d4test0 -> upstream/d4test0 * [new branch] d4test1 -> upstream/d4test1 * [new branch] http43 -> upstream/http43 * [new branch] opuls -> upstream/opuls * [new branch] target-4.3.21 -> upstream/target-4.3.21 * [new branch] target-4.3.22 -> upstream/target-4.3.22 * [new branch] target-4.3.23 -> upstream/target-4.3.23 * [new branch] target-4.4.0 -> upstream/target-4.4.0 * [new branch] target-4.4.2 -> upstream/target-4.4.2 * [new branch] target-4.4.3 -> upstream/target-4.4.3 * [new branch] test3 -> upstream/test3 * [new branch] test_framework -> upstream/test_framework * [new branch] try-gradleinitformaven -> upstream/try-gradleinitformaven * [new branch] x452 -> upstream/x452 https://github.com/unidata/thredds * [new tag] thredds-4.3.10 -> thredds-4.3.10 * [new tag] v4.3.11 -> v4.3.11 * [new tag] v4.3.12 -> v4.3.12 * [new tag] v4.3.13 -> v4.3.13 * [new tag] v4.3.14 -> v4.3.14 * [new tag] v4.3.15 -> v4.3.15 * [new tag] v4.3.16 -> v4.3.16 * [new tag] v4.3.17 -> v4.3.17 * [new tag] v4.3.18 -> v4.3.18 * [new tag] v4.3.19 -> v4.3.19 * [new tag] v4.3.20 -> v4.3.20 * [new tag] v4.3.22 -> v4.3.22 * [new tag] v4.3.8-beta -> v4.3.8-beta * [new tag] v4.3.9.alpha1 -> v4.3.9.alpha1 * [new tag] v4.4.0 -> v4.4.0 * [new tag] v4.4.1 -> v4.4.1 * [new tag] v4.4.2 -> v4.4.2 * [new tag] v4.5.0 -> v4.5.0 * [new tag] v4.5.1 -> v4.5.1

i know have 4.3.15 in local folder , update 4.3 lastly version , commit changes github without changing original. maybe, have create fork or local project don't know how update , commit changes own version.

regards

i these steps:

1) check out v4.3.15 branch separate directory

2) run diff check check differences between checked out version , own version.

3) apply changes checked out branch.

4) commit changes locally. have commit consists of changes made 4.3.15 version)

5) rebase commit on top of latest version interested in (i suppose 4.3.23).

6) solve conflicts might have.

7) commit changes locally.

8) force changes github.

eclipse git svn github

Comments

Post a Comment

Popular posts from this blog

php - Android app custom user registration and login with cookie using facebook sdk -

php - Android app custom user registration and login with cookie using facebook sdk - i developing android application in users need register , log in using facebook. approximately, flow. open app first time, authenticate facebook, data, send info server create them business relationship in application, start session new business relationship in server, cookie perform later interactions. so far good. what need know wich info have send server, can able identify users when log in seccond time. because need start session in server , send cookie android app farther interactions. i'm using php server side language. i thinking getting getaccesstoken() in android facebook sdk, pass server on business relationship creation , storing in android app. but can't manage how login users on sec time utilize app. any suggestions ? in advance ! to uniquely identify user within app, should create request /me , user's id. guaranteed unique , remain con
Read more

django - Access session in user model .save() -

django - Access session in user model .save() - is possible access current session in user model .save()? pseudo code of want achieve: # users.models.py def save(self, *args, **kwargs): created = true if self.pk: created = false super(abstractuser, self).save(*args, **kwargs) # post-save if created: look_for_invite_in_session_and_register_if_found(self, session) seems wrong in architecture. shouldn't access request in models layer. work request must done in view. can this: user, created = abstractuser.objects.get_or_create(name=name) if created: look_for_invite_in_session_and_register_if_found(user, request.session) django session
Read more

php - .htaccess Multiple Rewrite Rules / Prioritizing -

php - .htaccess Multiple Rewrite Rules / Prioritizing - here current htaccess file: rewriteengine on rewritecond %{http_host} !^www\.website\.com [nc] rewritecond %{http_host} ([^.]+)\.website\.com [nc] rewriterule ^(.*)$ http://www.website.com/gotourl.php?urlid=?%1 [l] rewriterule ^(\w+)$ ./gotourl.php?urlid=$1 [nc,l] rewriterule ^(\w+)/$ ./gotourl.php?urlid=$1 [nc,l] the website in question url shortener i'm working on testing/developing , personal use. above code may not ideal i'm not familiar .htaccess , made via googling , testing. want url shortening aspect: http://website.com/1234 -> http://website.com/gotourl.php?urlid=1234 http://website.com/1234/ -> http://website.com/gotourl.php?urlid=1234 the problem cannot figure out how ignore directories. want specific directories go specific pages: http://website.com/img (or) http://website.com/img/ -> http://website.com/img.php http://website.com/img/1234 (or) http://website.com/
Read more