def list_conflicts():
if not hf.already_initialized():
print "Please init a jet repo before calling other commands"
return
conflicts = hf.get_conflicts()
if conflicts:
print "You have the following merge conflicts to resolve:"
for conflict in conflicts:
print " %s" % conflict
else:
print "No merge conflicts are present!"
def list_conflicts():
if not hf.already_initialized():
print ("Please init a jet repo before calling other commands")
return
# Gets all conflicts that Jet can find, and presents them in a readable way
conflicts = hf.get_conflicts()
if conflicts:
print ("You have the following merge conflicts to resolve:")
for conflict in conflicts:
print (" %s" % conflict)
else:
print ("No merge conflicts are present!")
def list_conflicts():
if not hf.already_initialized():
print("Please init a jet repo before calling other commands")
return
# Gets all conflicts that Jet can find, and presents them in a readable way
conflicts = hf.get_conflicts()
if conflicts:
print("You have the following merge conflicts to resolve:")
for conflict in conflicts:
print(" %s" % conflict)
else:
print("No merge conflicts are present!")