I'm developing an application that needs to be translated to different languages. So, it seemed like a good idea to have a special branch 'i18n' that keeps up to date with the master, but gets all translations up and running.
The 'i18n' branch is not local to anyone, but, probably 90% of the time, only one developer is going to commit there. Using "git rebase" to keep up to date is okay until I try to "git push". Then it just says "non-fast forward" and refuses to push unless I use --force. I understand this "rebase" approach may lead to a mess in case of remote branches, but I was wondering if "git merge" is really the last bay? Because I don't want to see tons of merge commits mixed with the others in that branch. What workflow would you recommend? --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/git-users?hl=en -~----------~----~----~----~------~----~------~--~---
