search

5long / p3wm

Three-way merge .pacnew file
ISC License
12 stars 4 forks source link

Usage documentation #10

Open marcvangend opened 3 years ago

marcvangend commented 3 years ago

Thanks for sharing this utility. I would appreciate some more documentation on how to use it. More specifically, when I use a resolve tool such as Meld, it isn't clear to me how I should accept the merge result in Meld and return back to p3wm.

5long commented 1 year ago

Right now in man 8 p3wm, it is written that $MERGED: the merged file with conflicts markers. Users of p3wm are supposed to resolve all the conflicts in this file. And each resolve tool should have their own tutorial to teach users how to do a three-way merge.

I guess this is more a matter of "do you have experience of working with 3-way merge before using p3wm? (e.g. git merge-file)" and I really didn't give it much thought. But hey, the documentation already exists (barely though).

5long commented 9 months ago

(Back from another long hiatus)

Recently I tried using some new CLI tools (unrelated to this project). I could feel the frustration of not understanding how the tools is supposed to work. p3wm could really use some first-use friendly tutorial and UI improvement.