search

steelewool / iraf-v216

IRAF v2.16 / PCIX release
Other
0 stars 0 forks source link

Still having trouble with merge operation #39

Open RobSteele49 opened 7 years ago

RobSteele49 commented 7 years ago

Zach, When you get to doing this can you send me the notes I would need to do it myself? I'll try and remember to put this in the wiki for future reference.

RobSteele49 commented 7 years ago

2015 git fetch https://github.com/olebole/iraf-v216.git

2021 git fetch olebole 2022 git merge olebole/merge-all

Seem to do it - but maybe we can talk tonight (Wed.) I'll send a text.

RobSteele49 commented 7 years ago

Doing a new experiment with a new arm8/dev branch.

2167 git clone https://github.com/steelewool/iraf-v216.git 2168 cd iraf-v216/ 2169 git checkout track/olebole/merge-all 2170 git checkout -b arm8/dev 2176 git push origin arm8/dev

The last command successfully pushed the new arm8/dev branch to the steelewool repository.

RobSteele49 commented 7 years ago

These seemed to work to add Ole's latest merge-all changes:

2030 git remote add olebole https://github.com/olebole/iraf-v216.git 2034 git fetch olebole 2035 git merge olebole/merge-all 2038 git push origin arm8/dev

Without specifying origin arm8/dev it kept trying to push to Ole's repository.

RobSteele49 commented 7 years ago

Next questions, how to I back out from the 'git remote add olebole...' opeation?

RobSteele49 commented 7 years ago

alternate question: Do you think it is easier to just merge in Ole's changes as he posts them rather than using the 'git remote ...' feature of git - which I still don't completely understand. If you do, maybe we can chat about it.