trying out forking

trying out forking

There are merge conflicts, because there is no logical way to merge your branch and fork into the same file history. Which line would be on top? So you need to address the merge conflicts, which you can read up on. it's not a great state to be in but it does happen from time to time unfortunately. but you'll win a great merge conflict fixer badge if you do it!

Yeah, I noticed yesterday evening that it doesn't really make sense to edit the same file when trying out forking and branching because of this exact problem. But this conflict is a good learning experience. And if there is a badge to earn all the better.

added 3 commits

• 48050c46...b9ddd193 - 2 commits from branch lit:master
• 0e8196b3 - Merge branch 'master' into 'master'

Compare with previous version

merged

mentioned in commit ebddb7c4