#553 Fix issue with text box height

[BenRQ]

GameObject needs to be new for Unity to provide a proper height.
Apply to width too just in case.

[BenRQ]

I don't understand why I can't create another Pull request.... and why my 3 commits have been linked to the pull request for the fix #553
Sorry about this I probably did something wrong.

[redwolf2]

Every new commit you do on a branch that is used for a pull request, will be added to the pull request. This means, that you can continue to work on pull requests, after they are made.
The solution to this dilema: You create a branch for each pull request
In this case you could have two branches. One named "fr_translation" and one "dialogbox_fix". Those two can then be used to create separate pull requests.

You do:

1. Fork this repo (you already did that)
2. Create a branch based on your "development" branch named "fr_translation"
3. Switch to that branch
4. Change files and commit (to "fr_translation")
5. Push "fr_translation" from you local computer to the remove "fr_translation" (use the option create new branch if that branch does not exist)
6. Create "pull request" that points to bruces "development" branch
7. If you made an error, you can always do more commits on "fr_translation"

To fix your current situation:

1. Create a new branch based on your "development" branch named "fr_translation"
2. Switch to that branch
3. Revert to your right commit, where the changes are ok or change your files manually and do a new commit
4. Push "fr_translation" from you local computer to the remote "fr_translation" (use the option create new branch if that branch does not exist)
5. Point the Pull Request from your remote "ft_translation" to bruces "development"

(Do the same with a second branch for the other work)

I use https://tortoisegit.org/ for all git stuff, but https://desktop.github.com/ might be the easier tool and be worth a shot.

[BenRQ]

Thanks a lot for the explanation @redwolf2, I was getting lost here.

Indeed I should separate this fix, and the changes I did on UI.
Translations are linked to change on UI though.

[redwolf2]

You can pull from your other branches.

• development
• fr_translation
• dialogbox_fix
• ui_update

ui_update > pull > fr_translation

You can make your translation changes in fr_translation. If those changes are needed in ui_update, you can pull them from your fr_translation branch, which will merge them in the branch ui_update. That way, you also should be able to have translation values inside ui_update, that are new and don't appear inside fr_translation, while still being able to make updates on fr_translation.

[BenRQ]

Thanks, @redwolf2. The new pull requests are done from specific branches.
I did a lot of revert though, not sure I was supposed to do that.

So I understand I should never pull / commit in development if I want to be able to do clean branches.
Otherwise I would have to do reverts,

[redwolf2]

If you only provide one pull request at a time, it could be done in one branch. Making a separate branch is cleaner and prefered. But if you do multiple pull requests at a time, you have to create separate branches. If anything goes wrong in your development branch, you can always create a branch in your repository, based on bruces development branch on his remote repository.

Nice work! Now its up to Bruce to merge them in.

[BenRQ]

Thanks a lot redwolf2, your help is really appreciated!

One last question, just to be sure : won't the revert in every pull request be a problem ?
They might revert the changes applied with other pull request, won't they ?

I tried to do ui_update > pull > fr_translation
And it removes the ui_update when I try to pull the translation.

[redwolf2]

You are right, the revert may be the problem, because the commits contain deletes of those files you use in ui_update. In that case, you can cherry pick your files from the fr_translation branch.

Pulling (from remote) or Merge (from local) would work if there were no reverts (deleted files), this may be fixed by doing a rebase on the fr_translation branch. In TortoiseGit, switch to fr_translation, then "Show log", pick your commit and right click, "Reset fr_translaton to this..." (using Hard reset type). You can also combine multiple commits, using the function combine to one commit. After that, the Pull or Merge should work. You may want to make a local copy of your files before trying that out, just to be sure.

[BenRQ]

I tried many things for hours now, and I just can't work with those branches.
I tried rebase, reset, cherry pick ..... I just don't understand how to remove the original commits from the dev branch I'm coming from.

I give up, and I will recreate new branches from the origin/dev ..... and copy paste changes manually.

[redwolf2]

OK, no Problem. Do what works for you. Those deeper git concepts are hard to come by at first.