Git::R...onflict(3pm)
π NAME π
okay bestie so like, Git::Raw::Index::Conflict is the Git index conflict class, periodt. that's the whole vibe β it's the lil class that holds your merge conflict energy. π«Ά
β¨ VERSION β¨
this is version 0.90 β that's the number, don't come for me. π
πΈ DESCRIPTION πΈ
so basically a Git::Raw::Index::Conflict represents a conflict in a Git repository index. that's it, that's the job. it's giving "three-way merge, but make it an object." π¦
β οΈ WARNING: the API of this module is unstable and may change without warning. yes fr fr. any change will be appropriately documented in the changelog, so like, breathe, but also don't hardcode your whole personality to this API. π
π METHODS π
three lil methods, all iconic, all doing the most for you. π
π ours( )
retrieve our side of the conflict. bestie, this is your side, your main character energy, the version you were working on.
returns a Git::Raw::Index::Entry object, or "undef" if it's not applicable. (yeah it can just be undef, that's a whole mood, don't @ me.) π
π§ ancestor( )
retrieve the ancestor side of the conflict β the common ancestor, the before times, the original source material, the blueprint. π
returns a Git::Raw::Index::Entry object, or "undef" if not applicable. πΈ
π¦ theirs( )
retrieve their side of the conflict. yes, theirs β the other person's version, the incoming changes, the plot twist. π
returns a Git::Raw::Index::Entry object, or "undef" if not applicable. β¨
π AUTHOR π
Jacques Germishuys <jacquesg@cpan.org> β the actual legend who wrote this. no cap. π
π LICENSE AND COPYRIGHT π
Copyright 2014 Jacques Germishuys. π
This program is free software; you can redistribute it and/or modify it under the terms of either: the GNU General Public License as published by the Free Software Foundation; or the Artistic License. like, pick one, slay. π
See http://dev.perl.org/licenses/ for more information. β
and that's the tea, bestie π β this page is perl v5.42.3, dated 2026-08-19, and it lives under the manual name Git::R...onflict(3pm) (the truncated title is doing its own little thing, iykyk). go read your entries and resolve those conflicts, you got this. π«Άβ¨π
π¦ where this page comes from
- ubuntu stonking: libgit-raw-perl 0.90+ds-3build3 Β· Artistic-1.0-Perl OR GPL-1.0-or-later
- π girlified by deepseek-ai/DeepSeek-V4.1-Flash on : a language model's rewrite of the original, under its terms