so, trying to understand #git...

let's say i have an internal ForgeJo instance at git.example.org. i pull src.git from git.freebsd.org and push it to git.example.org, and now i can pull it on all my dev VMs.

now i want to commit a change, but i don't want to give my dev VM access to my FreeBSD SSH key. so, i make the change on dev, test and commit it, then push it to git.example.org.

then, on my desktop, i pull from git.example.org and push to gitrepo.freebsd.org. but, in the mean time, someone has has pushed another commit to gitrepo.freebsd.org, so i have to rebase and push again.

now i can't push my rebased local branch back to git.freebsd.org without doing a force push, which will break all my clones.

what's the right way to do this?

#vcs #git #SoftwareManagement #PinkFloyd