

def test_edit_file_with_a_conflict(self):
    with open('page.rst', 'w') as p:
        p.write((self.content + '\nremote line'))
    git.add('.')
    git.commit('-m', 'a remote log')
    self.page.raw = (self.page.raw + '\nlocal line')
    Git().commit(self.page)
    response = self.client.post(response.url, {
        
    })
    self.assertRegexpMatches((self.content + '\nlocal line\n?$'), self.page.raw)

dataset/ETHPy150Open mgaitan/waliki/tests/test_git_webhook.py TestGitWebhook.test_edit_file_with_a_conflict/VarMisuse@87/121 `self`->`response`