| [translations] troubles with Git: pull and push |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: LilyPond Translation <translations@xxxxxxxxxxx>
- Subject: [translations] troubles with Git: pull and push
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Thu, 13 Dec 2012 21:36:23 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=hCw2moIC3/YDzaGSOYiprw4XQSe57G4F4i0dA+RxCnc=; b=r10IrRqASlDHldpK0/xankBEKsg3emJVxPH4yn2Em5cnldJhm5okH8moYW5NS1aVnB eNS34b0cEAnkwOeWDRD4VZs3RSr20Cz6LiyLINEOwC6uq/YjM6gPzBMUpqkd4AffEsmw k5zy715vpg1Dgr1yAUal6A4+h8h5pWoykN9i9AfOGOLbKvNuhpLPoBRrMWz+Oe4DnLRV WzY2i+dvjz3X6TTVSecj44MG6TJ9fJO2rIe+GKCcC2doNnK3s0nnhWClNDQjVcCia03F Snj5VTS7SwrBKfiFTRqkUxpLcvjBAy4OE9qA7CEwVz7il++MDaaudys+lJwH3v0gIELl nuKg==
This is a multi-part message in MIME format.
Can you please remind me the process of pulling and pushing for translators?
I've just ended up in this situation:
$ git status
# On branch translation
# Your branch and 'origin/translation' have diverged,
# and have 1 and 5 different commits each, respectively.
#
nothing to commit (working directory clean)
How did I get there?
Before pushing my last commit, I run 'git pull' (without rebasing),
which forced me to merge my local branch with the remote branch. I was
not sure about this merge so I reset hard to my last commit.
IIRC, rebasing is not recommended for translators.
I have the attached patch to push.
How should I do now?
Thanks in advance
--
Federico