You'll see this checkbox if you have an active professional translation order created on the source branch, and this order is still in progress. If the branching feature is included in your subscription plan, you can enable it by proceeding to More > Settings: Please be aware that certain project elements are global (in other words, do not support branching) as explained in the corresponding section. This is very convenient because with branches you can safely experiment with your keys and translations without worrying that your changes might affect the "main" version of the project. If you prefer the master version, then simply delete the develop branch, otherwise you can merge the develop branch into master thus incorporating all the recent changes from develop. Now you can decide which translation suits best. This change will not affect the translation value stored in the master branch (it will still contain "Welcome to the app!" text). Initially the welcome key has identical translations in both branches, however you can switch to the develop branch and modify the key's value to "Welcome to our app". You enable branching and create two branches: master and develop. You can switch between these versions, delete them, and merge changes from one version into another.įor example, suppose you have a welcome key with the "Welcome to the app!" translation value. When the branching feature is enabled for a project, this project can have multiple independent versions. To put it simply, a branch is a separate version of your translation project. Lokalise supports branching similar to GitHub, with some limitations (see below). The development process often requires you to work on multiple branches. Please note that it is available only for "Software localization" type of projects, but not for "Documents". Our good friend git checkout is the right tool for the job.This feature is available from the Pro plan and above. The simplest thing that could possibly workĪs it turns out, we’re trying too hard. Maybe, but I think we might have our Git license revoked if we resort to such a hack. When in doubt, pull out the brute force approach? Surely we can just check out the feature branch, copy the files we need to a directory outside the repo, checkout the master branch, and then paste the files back in place. But we want to be done with this task in ten seconds, not ten minutes. Maybe we can just merge the whole branch using -squash, keep the files we want, and throw away the rest. You’re thinking of git add -interactive (which won’t work for our purposes either). We could hunt down the last commit to each of these files and feed that information to git cherry-pick, but that still seems like more work than ought to be necessary. We just want to grab these files in their current state in the feature branch and drop them into the master branch. We don’t want to have to track down all the commits related to these files. git cherry-pick wants to merge a commit - not a file - from one branch into another branch. The team has made numerous commits to the files in question. Isn’t this exactly what git cherry-pick is made for? Not so fast. This seems like it should be a simple enough task, so we start rummaging through our Git toolbox looking for just the right instrument. The code you need to grab is isolated to a handful of files, and those files don’t yet exist in the master branch. (For this example, we’ll assume mainline development occurs in the master branch.) You’re not ready to merge the entire feature branch into master just yet. Something comes up, and you need to add some of the code from that branch back into your mainline development branch. They’ve been working on the branch for several days now, and they’ve been committing changes every hour or so. Part of your team is hard at work developing a new feature in another branch.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |