Suggestions to User in bottom status-bar regarding current active object Tools (not added for insert-template tool)

[keshav2010]

Added information regarding object tools which is displayed in the bottom Status-bar,
all object tools covered except "Insert Template(V)" tool since i wasn't familiar with it enough.

[bjorn]

Please sort out the commits on your master branch. I think the easiest would be to make a new branch based on my master branch, and then cherry-pick change 7b9ddd1 on top of it (which seems to be the only relevant change). Then, force-push this new branch to your master on GitHub to update this pull request.

[keshav2010]

Okay, even though I've never done it before, i followed these steps

1. pulled your master into my master
2. then made a new branch on my fork, named it as "temp" and switched to temp now
3. now after switching to temp, i then executed following git command : git cherry-pick 7b9ddd1
4. after this, i then executed following command : git push -f origin master while being inside "temp" branch,

i wonder if i did the right thing or not.

[bjorn]

The last step was wrong. It force-pushed your local master to your master on GitHub, but the idea was to push the temp branch to master. Then the command should look like this:

git push -f origin temp:master

[keshav2010]

Thank you very much, I've executed that command now, if anything is still wrong, do let me know.

[bjorn]

@keshav2010 Alright, but it didn't do the trick. I think something went wrong in step 2 as well. You were supposed to make the new branch based on my master branch. It seems like you made it based on your master, so the cherry-pick just made the empty commit 11f35fb.

What did you call the remote pointing to my repository? Assuming it is called bjorn, you should do:

git checkout temp
git fetch bjorn
git reset --hard bjorn/master
git cherry-pick 7b9ddd1be47711e9c09b72dd640f6a1d7a9f0eb3
(maybe resolve conflicts)
git push -f origin temp:master

If everything goes alright, you should see the same changes in this PR, but only a single commit.

[keshav2010]

Yea, much cleaner now. i never added a remote that pointed to your master. Though i got it now. Thank you 😄

[bjorn]

@keshav2010 You need to create a separate branch for each pull request, to prevent your tileset view changes to show up here, as well as to prevent the status bar messages to become part of your tileset view work.

[keshav2010]

I think I've to close this specific pull request and re-open a new one that instead of merging my fork's master with your master, will merge a new branch (namely statusBarSuggestionFeature branch) to your master.
meanwhile, for the future pull request, I will avoid merging my master directly and rather use the separate dedicated branch for each feature.