Smooth out merging - Githubissues

JamesHutchison / ptyme-track

The obnoxiously hard to spell time tracking based on file modifications and signed reporting. The P is silent like in Pterodactyl

MIT License

0 stars 0 forks source link

Smooth out merging #24

Open JamesHutchison opened 1 year ago

JamesHutchison commented 1 year ago

When merging code that has time tracking involved, getting a merge conflict seems like it may for sure happen. This ticket is to investigate the issue and build out an automated solution so that no developer friction is created.