R
Size: a a a
R
R
🔐
N
DT
DT
А
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
А
N
DT
DT
N
NK
R
IC
def save(self, *args, **kwargs):
...
kwagrs.get('foobar')
...
super(Foo, self).save(*args, **kwargs)
IC
С
def save(self, *args, **kwargs):
...
kwagrs.get('foobar')
...
super(Foo, self).save(*args, **kwargs)
self.foobar
IC
self.foobar
p