def rebase(self, commitish):
commands = ["rebase", commitish]
try:
self.run(commands)
except GeoGigException, e:
if "conflict" in e.args[0]:
raise GeoGigConflictException(e.args[0])
else:
raise e
def pull(self, remote, branch, rebase=False):
commands = ["pull", remote, branch]
if rebase:
commands.append("--rebase")
try:
self.run(commands)
except GeoGigException, e:
if "conflict" in e.args[0]:
raise GeoGigConflictException(e.args[0])
else:
raise e
def merge(self, ref, nocommit=False, message=None):
commands = ["merge", ref]
if nocommit:
commands.append("--no-commit")
elif message is not None:
commands.append("-m")
commands.append(message)
try:
self.run(commands)
except GeoGigException, e:
if "conflict" in e.args[0]:
raise GeoGigConflictException(e.args[0])
else:
raise e