A modern programming language that makes developers happier.

kotlinlang

Think I've messed up my rebase/merge somehow, looks like it's doubled my commits? <https://github.com/lukebiddell/atrium/commits/contributing-faq>

There are different possibilities, one is rebase interactive, rearrange the commits and squash the  duplicates. &lt;https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History|https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History&gt;

Thanks for that, I've managed to fix the commits and rebase the latest changes.