Issues with multiple versions of local repositories
Hi all,
So I've been fairly noobish in the usage of git. Usually dealing with add, commit and push/pull; nothing more complicated than that.
However, now I've come across a case where I'll need to learn the more advanced aspects of git and was wondering if people could point me towards the right direction.
I have two local repositories all synced to one remote repository on gitlab. Let's call them personal
and work
for obvious reasons. Now, before the issue I would push the local changes in personal
to gitlab and would later pull the changes to work
and vice-versa. However, now I have made changes to the work
repo without first pulling in changes from personal
. I can't run git pull here because the changes have diverged. What's the best way to approach this situation?
Thanks in advance!