←back to thread

Ask HN: What are you working on (August 2024)?

634 points david927 | 2 comments | 24 Aug 24 22:00 UTC | HN request time: 0.001s | source

What are you working on? Any new ideas that you're thinking about?
Show context
csomar ◴[25 Aug 24 03:18 UTC] No.41344072[source]▶
I am working on a git merge conflict resolution tool. If this is a problem you have, feel free to shot me an email. Still very early stages.
replies(1): >>41344092 #
emporas ◴[25 Aug 24 03:22 UTC] No.41344092[source]▶
I don't know if you are aware of Pijul. It claims to have solved some issues with git merge. It is one of the tools i want to study, use and test extensively at some point.
replies(1): >>41344215 #
csomar ◴[25 Aug 24 03:49 UTC] No.41344215[source]▶
No, but from a quick glance it looks like an alternative to git? There might be value in studying their approach. But any solution I’ll be working on will have to fully work/integrate with a regular git workflow.
replies(1): >>41344275 #
1. emporas ◴[25 Aug 24 04:02 UTC] No.41344275[source]▶
Oh, if operating within git boundaries is a requirement, then a different version control system is no good.

The claim is, that pijul's merge of code is much better and simpler than git. Merges are idempotent and associative if i remember correctly. It cannot get much better than that.

replies(1): >>41344477 #
2. csomar ◴[25 Aug 24 04:51 UTC] No.41344477[source]▶
The reality is that most people are using git at the moment. I am looking to create a product that I'll be able to market and sell (rather something that I have fun R&Ding), so the git boundary is a requirement.