git-sync on deployment-puppetmaster03 for puppet fails to rebase since days ago:
[..] delete mode 100644 modules/toollabs/manifests/ferm_handlers.pp delete mode 100644 modules/toollabs/manifests/proxy.pp Rebasing (1/18)^MRebasing (2/18)^MRebasing (3/18)^MRebasing (4/18)^MRebasing (5/18)^MRebasing (6/18)^MRebasing (7/18)^Merror: could not apply 4ca798193e... [LOCAL HACK] Attempt to secure Puppet DB better When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".'; stderr: 'Could not pick 4ca798193eae42b6dc5ed2079590ff87a5772a00' 2019-10-30T07:30:22Z ERROR sync-upstream: Rebase failed!
I am not sure how to handle local conflicts in Beta, I pinged @Krenair (that I believe is the one working on the commit causing the conflict) but he may be afk so I am wondering what the procedure should be. Can I temporarily remove the commit to allow git-sync to work? If not, does anybody have context about what it is best to do?