Skip to content

Instantly share code, notes, and snippets.

@YaronBlinder

YaronBlinder/conflicts

Last active August 29, 2016 19:48
Show Gist options
  • Save YaronBlinder/18bf09053d573f65543ce3b618e36bc6 to your computer and use it in GitHub Desktop.
Save YaronBlinder/18bf09053d573f65543ce3b618e36bc6 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
conflicts
$ git pull origin workbench
Username for 'https://github.com': yaronblinder
From https://github.com/f0cal/edenis-v4msti
* branch workbench -> FETCH_HEAD
* [new branch] workbench -> origin/workbench
CONFLICT (rename/rename): Rename "Tests/calculateFVD/roipoly.py"->"v4msti/calcul ateFVD/roipoly.py" in branch "HEAD" rename "Tests/calculateFVD/roipoly.py"->"tes ts/calculateFVD/roipoly.py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/length_calculator_ported.py "->"v4msti/calculateFVD/length_calculator_ported.py" in branch "HEAD" rename "Te sts/calculateFVD/length_calculator_ported.py"->"tests/calculateFVD/length_calcul ator_ported.py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/helpers_calculateFVD.py"->" v4msti/calculateFVD/calculateFVD_helpers.py" in branch "HEAD" rename "Tests/calc ulateFVD/helpers_calculateFVD.py"->"tests/calculateFVD/helpers_calculateFVD.py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/bifurcation_counter_ported. py"->"v4msti/calculateFVD/bifurcation_counter_ported.py" in branch "HEAD" rename "Tests/calculateFVD/bifurcation_counter_ported.py"->"tests/calculateFVD/bifurca tion_counter_ported.py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/Zhang_Suen_ported.py"->"v4m sti/calculateFVD/Zhang_Suen_ported.py" in branch "HEAD" rename "Tests/calculateF VD/Zhang_Suen_ported.py"->"tests/calculateFVD/Zhang_Suen_ported.py" in "99739439 186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/Zhang_Suen_Odd_ported.py"-> "v4msti/calculateFVD/Zhang_Suen_Odd_ported.py" in branch "HEAD" rename "Tests/ca lculateFVD/Zhang_Suen_Odd_ported.py"->"tests/calculateFVD/Zhang_Suen_Odd_ported. py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
CONFLICT (rename/rename): Rename "Tests/calculateFVD/Zhang_Suen_Even_ported.py"- >"v4msti/calculateFVD/Zhang_Suen_Even_ported.py" in branch "HEAD" rename "Tests/ calculateFVD/Zhang_Suen_Even_ported.py"->"tests/calculateFVD/Zhang_Suen_Even_por ted.py" in "99739439186a36bab17c6b0aaa5c873a1ae710b2"
Removing v4msti/Untitled.ipynb
Removing v4msti/4.tif
Removing v4msti/3.tif
Removing v4msti/2.tif
Removing v4msti/1.tif
Removing v4msti/.lab/lab.db
Removing v4msti/.lab/c2e7f67d8bc12779da6936da8222181a
Removing v4msti/.lab/bad4f9355655be1263d00b05b8647ee0
Removing v4msti/.lab/83862f19c03765d05cf433d4b3717d37
Removing v4msti/.lab/351cddc7dad4d586cfb4c729641bab08
CONFLICT (rename/delete): tests/test_calculateSC.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b0aaa5 c873a1ae710b2 of tests/test_calculateSC.py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/test_spectralfitting.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 9973943 9186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/test_spectralfitting. py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/spectralfitting_helpers.py delet ed in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 9973 9439186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/spectralfitting_he lpers.py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/rt_insert.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab1 7c6b0aaa5c873a1ae710b2 of tests/spectralfitting/rt_insert.py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/optimget_matlab.m deleted in HEA D and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a3 6bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/optimget_matlab.m left in t ree.
CONFLICT (rename/delete): tests/spectralfitting/fminsearch_matlab.m deleted in H EAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186 a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/fminsearch_matlab.m left in tree.
CONFLICT (rename/delete): tests/spectralfitting/fitspectrum_noMelanin_ported.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/fitspectrum_n oMelanin_ported.py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/fitspectrum_noMelanin.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 9973943 9186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/fitspectrum_noMelanin .m left in tree.
CONFLICT (rename/delete): tests/spectralfitting/fcnchk_matlab.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36b ab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/fcnchk_matlab.m left in tree.
CONFLICT (rename/delete): tests/spectralfitting/demo_spectralfitting_noMelanin_p orted.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2 . Version 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/demo _spectralfitting_noMelanin_ported.py left in tree.
CONFLICT (rename/delete): tests/spectralfitting/demo_spectralfitting_noMelanin.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Versio n 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/demo_spectra lfitting_noMelanin.m left in tree.
CONFLICT (rename/delete): tests/spectralfitting/SpectralLIBMU.mat deleted in HEA D and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a3 6bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/SpectralLIBMU.mat left in t ree.
CONFLICT (rename/delete): tests/spectralfitting/Fig_theory.png deleted in HEAD a nd renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36ba b17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/Fig_theory.png left in tree.
CONFLICT (rename/delete): tests/spectralfitting/Fig_measurement.png deleted in H EAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186 a36bab17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/Fig_measurement.png left in tree.
CONFLICT (rename/delete): tests/spectralfitting/Fig_errors.png deleted in HEAD a nd renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36ba b17c6b0aaa5c873a1ae710b2 of tests/spectralfitting/Fig_errors.png left in tree.
CONFLICT (rename/delete): tests/calculateSC/test_calculateSC.py deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36b ab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/test_calculateSC.py left in tree.
CONFLICT (rename/delete): tests/calculateSC/stdfilt_matlab.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab1 7c6b0aaa5c873a1ae710b2 of tests/calculateSC/stdfilt_matlab.m left in tree.
CONFLICT (rename/delete): tests/calculateSC/rt_insert.py deleted in HEAD and ren amed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b 0aaa5c873a1ae710b2 of tests/calculateSC/rt_insert.py left in tree.
CONFLICT (rename/delete): tests/calculateSC/calculateSC_ported.py~origin_Workben ch deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Vers ion 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/calculateSC_po rted.py~origin_Workbench left in tree.
CONFLICT (rename/delete): tests/calculateSC/calculateSC_ported.py~HEAD deleted i n HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439 186a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/calculateSC_ported.py~HEAD left in tree.
CONFLICT (rename/delete): tests/calculateSC/calculateSC_helpers.py deleted in HE AD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a 36bab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/calculateSC_helpers.py left in tree.
CONFLICT (rename/delete): tests/calculateSC/calculateSC.m deleted in HEAD and re named in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6 b0aaa5c873a1ae710b2 of tests/calculateSC/calculateSC.m left in tree.
CONFLICT (rename/delete): tests/calculateSC/avg_tmp_py.npy deleted in HEAD and r enamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c 6b0aaa5c873a1ae710b2 of tests/calculateSC/avg_tmp_py.npy left in tree.
CONFLICT (rename/delete): tests/calculateSC/algstdfilt.m deleted in HEAD and ren amed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b 0aaa5c873a1ae710b2 of tests/calculateSC/algstdfilt.m left in tree.
CONFLICT (rename/delete): tests/calculateSC/SSM5x5-NIR_17680054_20160629103337_S pectralon LEDs.tif deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c87 3a1ae710b2. Version 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateS C/SSM5x5-NIR_17680054_20160629103337_Spectralon LEDs.tif left in tree.
CONFLICT (rename/delete): tests/calculateSC/SSM5x5-NIR_17680054_20160629102647.t if deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Vers ion 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/SSM5x5-NIR_176 80054_20160629102647.tif left in tree.
CONFLICT (rename/delete): tests/calculateSC/SSM5x5-NIR_17680054_20160629102147.t if deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Vers ion 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateSC/SSM5x5-NIR_176 80054_20160629102147.tif left in tree.
CONFLICT (rename/delete): tests/calculateSC/SSM5x5-NIR_17680054_20160629100155_R oom Light Off_Spectralon.tif deleted in HEAD and renamed in 99739439186a36bab17c 6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b0aaa5c873a1ae710b2 of tests/ calculateSC/SSM5x5-NIR_17680054_20160629100155_Room Light Off_Spectralon.tif lef t in tree.
CONFLICT (rename/delete): tests/calculateFVD/test_calculateFVD.py deleted in HEA D and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a3 6bab17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/test_calculateFVD.py left in t ree.
CONFLICT (rename/delete): tests/calculateFVD/rt_insert.py deleted in HEAD and re named in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6 b0aaa5c873a1ae710b2 of tests/calculateFVD/rt_insert.py left in tree.
CONFLICT (rename/delete): tests/calculateFVD/makelut_matlab.m deleted in HEAD an d renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab 17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/makelut_matlab.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/length_calculator.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36 bab17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/length_calculator.m left in tre e.
CONFLICT (rename/delete): tests/calculateFVD/fcnchk_matlab.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab1 7c6b0aaa5c873a1ae710b2 of tests/calculateFVD/fcnchk_matlab.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/example.tif deleted in HEAD and ren amed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6b 0aaa5c873a1ae710b2 of tests/calculateFVD/example.tif left in tree.
CONFLICT (rename/delete): tests/calculateFVD/calculateFVD_ported.py deleted in H EAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186 a36bab17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/calculateFVD_ported.py left in tree.
CONFLICT (rename/delete): tests/calculateFVD/calculateFVD.m deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17 c6b0aaa5c873a1ae710b2 of tests/calculateFVD/calculateFVD.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/bifurcation_counter.m deleted in HE AD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a 36bab17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/bifurcation_counter.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/applylut_matlab.m deleted in HEAD a nd renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36ba b17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/applylut_matlab.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/Zhang_Suen_Odd.m deleted in HEAD an d renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab 17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/Zhang_Suen_Odd.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/Zhang_Suen_Even.m deleted in HEAD a nd renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36ba b17c6b0aaa5c873a1ae710b2 of tests/calculateFVD/Zhang_Suen_Even.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/Zhang_Suen.m deleted in HEAD and re named in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17c6 b0aaa5c873a1ae710b2 of tests/calculateFVD/Zhang_Suen.m left in tree.
CONFLICT (rename/delete): tests/calculateFVD/Untitled.ipynb deleted in HEAD and renamed in 99739439186a36bab17c6b0aaa5c873a1ae710b2. Version 99739439186a36bab17 c6b0aaa5c873a1ae710b2 of tests/calculateFVD/Untitled.ipynb left in tree.
Removing ported_python_code/calculateSC/helpers.py
Removing ported_python_code/calculateSC/calculateSC_ported.py
Removing README.md
Removing .lab/lab.db
Automatic merge failed; fix conflicts and then commit the result.
Raw
git branch -a
$ git branch -a
Tests
calculateFVD
calculateSC
master
spectralfitting
* workbench
remotes/origin/HEAD -> origin/master
remotes/origin/Tests
remotes/origin/Workbench
remotes/origin/calculateFVD
remotes/origin/calculateSC
remotes/origin/master
remotes/origin/spectralfitting
Raw
git log
$ git log
commit 1f91080d902fd461204b6c282d89be168cc60f18
Author: Yaron Blinder <[email protected]>
Date: Mon Aug 29 15:24:52 2016 -0400
calculateFVD split into functions, calcFVD implemented
commit b4466eca4d0262619c1a145da369a433d27204c5
Author: Yaron Blinder <[email protected]>
Date: Mon Aug 29 13:12:25 2016 -0400
calcSC files reordered
commit 84bf3842ea1063a8742fe00528bdc52da5ec1241
Merge: fd19b0a 32f1c83
Author: YaronBlinder <[email protected]>
Date: Fri Aug 26 14:43:17 2016 -0400
Merge remote-tracking branch 'origin/Workbench' into Workbench
commit fd19b0a84298973562bb0e7f4fac43797616713e
Author: YaronBlinder <[email protected]>
Date: Fri Aug 26 14:32:24 2016 -0400
calcSC CLI first pass
commit 4adca76015d8aedad4bb54606a630c76d3420cab
Author: YaronBlinder <[email protected]>
Date: Mon Aug 15 10:48:50 2016 -0400
spectralfitting test
Currently stuck on testing fminsearch_m
commit 7f5108736a4226aea15d6b1ac9fdb448e3684603
Author: YaronBlinder <[email protected]>
Date: Wed Aug 10 23:52:17 2016 -0400
calculateSC test
commit eaf6e89ecde58318b5041bdf54161d9a74b943c0
Author: YaronBlinder <[email protected]>
Date: Wed Aug 10 16:26:31 2016 -0400
all tests passed
commit 1d63ef29b74baf1dc1441281cf3a906b2a4eb5e3
Author: YaronBlinder <[email protected]>
Date: Wed Aug 10 13:46:32 2016 -0400
calculateFVD test
commit dc029a2e2df870aa21498a8a2e0b58f1b3da82df
Author: YaronBlinder <[email protected]>
Raw
git pull
$ git pull
Username for 'https://github.com': yaronblinder
From https://github.com/f0cal/edenis-v4msti
* [new branch] Workbench -> origin/Workbench
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> workbench
Raw
git status
$ git status
On branch workbench
You have unmerged paths.
(fix conflicts and run "git commit")
Changes to be committed:
deleted: ../.lab/lab.db
deleted: ../README.md
deleted: ../ported_python_code/calculateSC/calculateSC_ported.py
deleted: ../ported_python_code/calculateSC/helpers.py
deleted: .lab/351cddc7dad4d586cfb4c729641bab08
deleted: .lab/83862f19c03765d05cf433d4b3717d37
deleted: .lab/bad4f9355655be1263d00b05b8647ee0
deleted: .lab/c2e7f67d8bc12779da6936da8222181a
deleted: .lab/lab.db
deleted: 1.tif
deleted: 2.tif
deleted: 3.tif
deleted: 4.tif
deleted: Untitled.ipynb
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both deleted: ../Tests/calculateFVD/Zhang_Suen_Even_ported.py
both deleted: ../Tests/calculateFVD/Zhang_Suen_Odd_ported.py
both deleted: ../Tests/calculateFVD/Zhang_Suen_ported.py
both deleted: ../Tests/calculateFVD/bifurcation_counter_ported.py
both deleted: ../Tests/calculateFVD/helpers_calculateFVD.py
both deleted: ../Tests/calculateFVD/length_calculator_ported.py
both deleted: ../Tests/calculateFVD/roipoly.py
added by them: ../tests/calculateFVD/Untitled.ipynb
added by them: ../tests/calculateFVD/Zhang_Suen.m
added by them: ../tests/calculateFVD/Zhang_Suen_Even.m
added by them: ../tests/calculateFVD/Zhang_Suen_Even_ported.py
added by them: ../tests/calculateFVD/Zhang_Suen_Odd.m
added by them: ../tests/calculateFVD/Zhang_Suen_Odd_ported.py
added by them: ../tests/calculateFVD/Zhang_Suen_ported.py
added by them: ../tests/calculateFVD/applylut_matlab.m
added by them: ../tests/calculateFVD/bifurcation_counter.m
added by them: ../tests/calculateFVD/bifurcation_counter_ported.py
added by them: ../tests/calculateFVD/calculateFVD.m
added by them: ../tests/calculateFVD/calculateFVD_ported.py
added by them: ../tests/calculateFVD/example.tif
added by them: ../tests/calculateFVD/fcnchk_matlab.m
added by them: ../tests/calculateFVD/helpers_calculateFVD.py
added by them: ../tests/calculateFVD/length_calculator.m
added by them: ../tests/calculateFVD/length_calculator_ported.py
added by them: ../tests/calculateFVD/makelut_matlab.m
added by them: ../tests/calculateFVD/roipoly.py
added by them: ../tests/calculateFVD/rt_insert.py
added by them: ../tests/calculateFVD/test_calculateFVD.py
added by them: ../tests/calculateSC/SSM5x5-NIR_17680054_20160629100155_Room Light Off_Spectralon.tif
added by them: ../tests/calculateSC/SSM5x5-NIR_17680054_20160629102147.tif
added by them: ../tests/calculateSC/SSM5x5-NIR_17680054_20160629102647.tif
added by them: ../tests/calculateSC/SSM5x5-NIR_17680054_20160629103337_Spectralon LEDs.tif
added by them: ../tests/calculateSC/algstdfilt.m
added by them: ../tests/calculateSC/avg_tmp_py.npy
added by them: ../tests/calculateSC/calculateSC.m
added by them: ../tests/calculateSC/calculateSC_helpers.py
added by them: ../tests/calculateSC/calculateSC_ported.py~HEAD
added by them: ../tests/calculateSC/calculateSC_ported.py~origin_Workbench
added by them: ../tests/calculateSC/rt_insert.py
added by them: ../tests/calculateSC/stdfilt_matlab.m
added by them: ../tests/calculateSC/test_calculateSC.py
added by them: ../tests/spectralfitting/Fig_errors.png
added by them: ../tests/spectralfitting/Fig_measurement.png
added by them: ../tests/spectralfitting/Fig_theory.png
added by them: ../tests/spectralfitting/SpectralLIBMU.mat
added by them: ../tests/spectralfitting/demo_spectralfitting_noMelanin.m
added by them: ../tests/spectralfitting/demo_spectralfitting_noMelanin_ported.py
added by them: ../tests/spectralfitting/fcnchk_matlab.m
added by them: ../tests/spectralfitting/fitspectrum_noMelanin.m
added by them: ../tests/spectralfitting/fitspectrum_noMelanin_ported.py
added by them: ../tests/spectralfitting/fminsearch_matlab.m
added by them: ../tests/spectralfitting/optimget_matlab.m
added by them: ../tests/spectralfitting/rt_insert.py
added by them: ../tests/spectralfitting/spectralfitting_helpers.py
added by them: ../tests/spectralfitting/test_spectralfitting.py
added by them: ../tests/test_calculateSC.py
added by us: calculateFVD/Zhang_Suen_Even_ported.py
added by us: calculateFVD/Zhang_Suen_Odd_ported.py
added by us: calculateFVD/Zhang_Suen_ported.py
added by us: calculateFVD/bifurcation_counter_ported.py
added by us: calculateFVD/calculateFVD_helpers.py
added by us: calculateFVD/length_calculator_ported.py
added by us: calculateFVD/roipoly.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
../New folder/
../wolong/
Raw
grr
$ git push origin workbench
Username for 'https://github.com': yaronblinder
To https://github.com/f0cal/edenis-v4msti.git
! [rejected] workbench -> workbench (non-fast-forward)
error: failed to push some refs to 'https://github.com/f0cal/edenis-v4msti.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment