search

MrFarland / DM-Operations-Center

The DM Operations Center is a collection of rules and tools for 5th edition Dungeons & Dragons dungeon masters that use the advanced Virtual Tabletop application Encounter+
https://donfarland.com
Other
38 stars 10 forks source link

Create "dev" branch for volatile JS development. #71

Closed MrFarland closed 2 years ago

MrFarland commented 2 years ago

I am creating this issue as an umbrella for any issues I run into related to the creation and management of a new "dev" branch. As someone relatively new to using Git, I suspect I'll run into some issues here and there related to managing and merging branches.

Comment if you see any issues related to my management of the branches while I'm learning.

TheCrazySpy commented 2 years ago

Merge issues may only become an issue if more than one developer is working on the same code. As long as each person maintains their working copy though, merge conflicts shouldn't exist.