Open shawnpringle opened 2 months ago
@shawnpringle We should probably create separate branch so your changes could go there? Created pob
branch and if no conflicts, it could be merged there.
Okay I will do that. I think I am a conflict magnet. No pun intended. Perhaps you guys can five mw pointers to solutions for fixing conflicts. If I can get all the changes from the rest of the devs with mine some how. I should merge daily in the future.
Shawn Pringle
On Sat, May 4, 2024, 16:05 Feruz M @.***> wrote:
@shawnpringle https://github.com/shawnpringle We should probably create separate branch so your changes could go there? Created pob branch and if no conflicts, it could be merged there.
— Reply to this email directly, view it on GitHub https://github.com/ecency/ecency-vision/pull/1590#issuecomment-2094349030, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAUVO5PHA4L7SJEXM6R72JLZAUWQZAVCNFSM6AAAAABG4X62JOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAOJUGM2DSMBTGA . You are receiving this because you were mentioned.Message ID: @.***>
Changes are diverted a lot, unfortunately, conflicts should be resolved manually and tested...
That is fair of course. Oh. this was about that small change and involving updating posts when notifications indicate it is out of sync. I cannot push to that branch. How does it play a role now?
On Mon, May 6, 2024, 03:11 Feruz M @.***> wrote:
Changes are diverted a lot, unfortunately, conflicts should be resolved manually and tested...
— Reply to this email directly, view it on GitHub https://github.com/ecency/ecency-vision/pull/1590#issuecomment-2095259762, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAUVO5IRIMRLLNWOJJWKHNLZA4NKVAVCNFSM6AAAAABG4X62JOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAOJVGI2TSNZWGI . You are receiving this because you were mentioned.Message ID: @.***>
my changes