git pull --rebase
ActivePublic
Actions

Authored by ardumont on Oct 9 2019, 2:58 PM.

Tags

None

Subscribers

None

	git pull --rebase
	remote: Enumerating objects: 21, done.
	remote: Counting objects: 100% (21/21), done.
	remote: Compressing objects: 100% (11/11), done.
	remote: Total 12 (delta 6), reused 0 (delta 0)
	Unpacking objects: 100% (12/12), done.
	From ssh://forge.softwareheritage.org/diffusion/DLDG/swh-loader-git
	41af03e..2433104 master -> origin/master
	First, rewinding head to replay your work on top of it...
	Applying: tox.ini: Fix py3 environment to use swh/loader/git packaged tests
	Using index info to reconstruct a base tree...
	M swh/loader/git/tests/test_from_disk.py
	M tox.ini
	Falling back to patching base and 3-way merge...
	Auto-merging tox.ini

Event Timeline

ardumont created this paste.Oct 9 2019, 2:58 PM