really can't do without tracking changes within one single review
loop, then fork a new branch in manpages-l10n and merge the changes
back to master when finished. Or at least, be more careful please when
committing anything. Thanks in advance.
Well I am "happy" to open this topic because I am not confortable with
the situation just now. Here is what I experience, tell me the proper
process. The origin on my problem is I dont know Git enough. Merging
would be a pain for me, so ok to be careful, but then please help me
with a process.
So currently the situation is:
- I start a page (eg. find)
- the loop is long (about 1 month for such page)
- before pushing, git tells me "no, please git pull first"
- pull fails because between the beginning of the loop and now, find was
changed (I guess an automation)
- the situation becomes then completely confusing. Just like I did a few
minutes ago, I have to rm the file, put my copy, add it, and push.
So the problem I identify is that some changes happen while I am working
on the po and I cannot identify them and handle them.
What should I do then which would make sense? I feel merging will be a
pain, so what care process should I use to ensure the commit is good and
dont result failures and side-effects? An idea I am having: should I
push any work once done, even if not reviewed in our loop? I can,
indeed, push any change I do immediately and just mark the commit as
definite or "WIP"? Maybe the fact to commit once the loop is finished is
an error?
Thanks for your help. And sorry for the mess. Git stays a pain for me
but... will learn.