mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Added a comment: when push fails due to non-fast-forward merge, pull and retry?

Browse source
This commit is contained in:
Ilya_Shlyakhter 2018-09-12 17:56:41 +00:00 committed by admin
parent a099fd4184
commit 7bee3d9e1e
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/git-annex-sync/comment_1_2e12ed1c1a594dfbd06a3f25f5e25e57._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="when push fails due to non-fast-forward merge, pull and retry?"
date="2018-09-12T17:56:40Z"
content="""
When a push would result in a non-fast-forward merge, git-annex-sync currently fails. Maybe instead, pull and retry pushing? This happens in the context of several processes trying to push to the same git-annex repo.
Also, the docs mention synced/master, but it's synced/current-branch.
"""]]