issues
search
cyrusae
/
highlighter-public
Next.js/SQLite app for qualitative coding and content analysis; prototype currently in (sometimes) working alpha.
Other
3
stars
0
forks
source link
Merge conflicts
#65
Closed
cyrusae
closed
2 years ago
cyrusae
commented
2 years ago
/cosmetics vs /main are having a problem.
[x] Make manual reconciliation branch since reconciliation via CLI gives errors.
[x] Copy over actual code progress by hand.
[x] Check that
reconciliation
branch is stable.
[x]
Merge reconciliation branch to main
Replace main with reconciliation, Jesus Christ.
[x] Figure out how to gitignore this out of happening again.
cyrusae
commented
2 years ago
66
/cosmetics vs /main are having a problem.
reconciliation
branch is stable.Merge reconciliation branch to mainReplace main with reconciliation, Jesus Christ.