search

postiffm / bibledit-desktop

Desktop version of Bibledit
GNU General Public License v3.0
4 stars 6 forks source link

Locale corrections #118

Closed LAfricain closed 4 years ago

LAfricain commented 5 years ago

Dear Matthew, Really I don't understand what I did. I create a new branch localeCor, I commited the changes, I pushed with:

git push --set-upstream origin localeCor

And now when I want to pull a request I have all the commit of all my branches!!! I have no idea how to do this properly. If you have an idea please explain me. Maybe you can just pick the commit you need (5fd44cd).

postiffm commented 5 years ago

I will probably cherry-pick the one commit that makes these changes.

Only a guess: maybe you branched off of a prior development branch (for the help docs), and to commit the child branch it had to commit the parent all the way back to the master.

LAfricain commented 5 years ago

I will probably cherry-pick the one commit that makes these changes.

Ok, you can also cherry-pick the desktop correction.

maybe you branched off of a prior development branch (for the help docs)

Do you have an idea how to do it well? Probably git push --set-upstream origin localeCor is not the good command...

postiffm commented 5 years ago

I have not used the -set-upstream switch. I am thinking that the best way would be something like this:

git checkout master git checkout -b localeCor <== make new branch based on master

git commit -am "Commit message" git push What I'm saying is to start from the latest master and create a new branch off of that for any change that you want to make. Don't mix it with or make it a child of other unnecessary branches.
LAfricain commented 5 years ago

Ok thanks next time I will try this.

postiffm commented 4 years ago

I am accepting 9b8c624 and 5fd44cd into master via cherry-pick. The rest of these commits are related to the help system, which I will deal with in PR #114.

I had to fix the header information in the .pot file in this PR. Not sure why this got messed up.