On 10/11/13 14:37, Vincent van Ravesteijn wrote:
>> Hope it's now all ok and u can see the repo. The feature is in the
>> features/chat branch.
>>
>> T.
>>
> Yes, it works now.
other question/help: now I'm co-editing with Kornel on this repo and branch, so
there's an inter-spacing of commits of ours. Plus, I try to synch-up with
master from time to time, so I'm doing often:
$ git branch
* features/chat
...
$ git pull --rebase origin master
$ git pull --rebase tommaso features/chat
$ git push tommaso features/chat
Now, are the --rebase above actually required ?
During one of these operations, I had a conflict on po/sk.po, and I happened to
have deleted the file in the hope to be able to "git checkout po/sk.po" again,
but it turned out that I ended up committing in my local repo the empty file as
part of the --rebase-ed patch by Kornel that was actually adding a couple of
translations within the file, with a hell of patch reverting and moving back to
history and squashing, with which I believed to have fixed the problem...
... but it keeps conflicting on po/sk.po every time I pull and there's smth new
to pull. So, I'm recently answering "git rebase --skip" as it's becoming a bit
annoying.
Any hint as to how to restore a sane environment (branch) :-) ?
T.
