How to change merge, nocommit to merge when pull the data in smartgit - smartgit

enter image description hereAm using samrtgit 8.0.4.1 on windows os . When i am commit the code commited successfully, No problem. But pull the data from the server is pull the data with merge ,no commit. How to change merge? Please reply...

When you click Pull, it shows you a Pull dialog. On that dialog, Click "More Options" and select how to do pull: with merge or rebase.

Get the latest build (10125) from Help|Check for Latest Build. After successful update issue was solved.

Related

spring-dev-tools does not reloading changes in project, Intellij idea

Maven dependency spring-boot-devtools does not reloading changes in a project automatically.
I have solved this problem by changing parameters of "running configuration".
Go to edit configuration->
In the Spring boot section you will see -
Running Application Update Polices - options
change - "On 'Update' action - to -> Update trigger file
and - "On frame deactivation - to -> Update classes and resources.
Apply changes and press OK.
I have solved this problem by changing parameters of "running configuration".
Go to edit configuration-> In the Spring boot section you will see -
Running Application Update Polices - options
change - "On 'Update' action - to -> Update trigger file and - "On frame deactivation - to -> Update classes and resources.
Apply changes and press OK.
The problem has been fixed for me after following the below steps.
Please go to the Top Right Corner of your "IntelliJ IDE" and then click on the ellipsis symbol (three vertical dots)->choose "Configure Edit Tabs"
Expand "Build, Execution and Deployment" -> Compiler-> Check the option "Build Project Automatically"
Click on "Advanced Settings" -> Select the Check the option under Compiler
-> "Allow auto-make to start even if developed application is currently running"
Please note that I'm using the "IntelliJ IDEA 2022.2" version.
Hope this helps!

KIWI TCMS - Test case content deleted when changing status

I have installed Kiwi-tcms locally as a docker container on an Ubuntu server.
Everything works as expected except when I want to write a new test case.
Here are the steps I used:
Prerequisites:
A testplan already created
Steps:
login to Kiwi
select a testplan from the dashboard
click on "Write new case" in the cases tab
fill mandatory field
click on "Save" and go back to the testplan
go to "Reviewing cases"
change the status of the test case previously created from "Proposed" to "Confirmed"
Expected result:
Test case is updated with the status chosen
Actual result:
Test case content deleted: title and content deleted but test case created.
More info:
I cannot reproduce this bug when I edit the test case and change the status inside the description.
I have not been able to reproduce this bug with the online demo so I guess there's something wrong with my docker configuration or application configuration.
Any ideas on what could be wrong?
Thanks.
This is a bug which affects the latest available version. Already fixed here: https://github.com/kiwitcms/Kiwi/issues/1318
will be released in the next update.

Oracle ADF - Redirect link is not working

I am developing a simple application using ADF comes with basic CRUD operations (create, read, update, delete). In this case, as you can see, I have dragged a link to the 1st column which is highlighted in yellow.
So whenever I deploy it and click that, it is supposed to redirect me to the Edit page where client will allow to make commit:
I did make sure the Action of link is associated with the Edit page (as highlighted in yellow above). However, the link wouldn't redirect me anywhere, no response.This is the unbounded task flow:
Okay so I have found out the solution. Due to the default setting, the application will be deployed on IE and this message will prompt out. As you can see, the message is mentioning about browser's compatibility. My IE is version 11.6, I'm not sure what's the issue here since my IE is kinda latest version but this message still pops out and affects the redirect link from working. However, simply copy the application URL to Google Chrome and run should fix this issue. Hope this helps in future.
If the two pages in the Unbounded Task Flow, then Add WildCard Control Flow Rule
and connect the two pages with the WildCard.
Or you can use the Popup instead of opening a new page for edit

CRMAP7009 : CCRC Command "RemoveResource" failed - Clearcase

I have created a view in ClearCase in which I have worked for sometime and then I was getting some issues in checkin and checkout afterwards so I have deleted that view and created new one which is working fine.
But now sudden I got to know that there are some files added to the source control which are reflecting and not required.
Issue: I went to clear team Navigator -> In sub stream Activities.
There I can see the activity that I committed.
On right click on activity, I can see only options: Remove Activity, Check in (which I cannot do), Disconnect, Show change set, refresh, remove properties.
Now when I trying to remove that activity it is giving an error:
CRMAP7009 : CCRC Command "RemoveResource" failed
I cannot share screenshots because it is restricted.
Does anyone having idea, how can I remove the activity?
It looks like you still have checked out files, but in a view that has been since deleted.
See if an admin can make sure your view is fully unregistered and remove for all vobs, which would make those files not checked out anymore.
See "Manually remove Web views for CCRC and CCWeb" (CC 7.x but could apply to 8 or 9), which involves:
cleartool rmview -uuid <uuid> -all
cleartool unregister -view -uuid <uuid>
Once those files are not checked out anymore, the activity will be empty, and you will be able to delete it.
The OP AIM confirms below:
we did not able to clear view from my end.
So admin went to the server and clear the views and the left checkouts and that helped
The way an admin would have clean this view on the server side is by running those same commands I mention above.

Wordpress Error: Database Update Required

I'm currently working with a client right now that clicked to update a plugin on WordPress. He's unaware of what plugin it was that he updated because he's clicked update in the past for other plugins and they just updated, so he paid little attention to what it was he clicked.
His site is still up, but when I try to get into the back end using /wp-admin I'm hit with a message that states:
Database Update Required
WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.
The update process may take a little while, so please be patient.
Update Wordpress Database
When I click on the button that says "Update WordPress Database" it does nothing. The browser spins and then shows me a blank white page with Wordpress at the top. I'm at a loss because I can't even login, it doesn't give me the option.
Any thoughts on what is happening? Thanks a bunch in advance for the assistance.
This is due to a missmatch between the databases versions you said you are using in the settings.
Please follow this steps:
Go to /wp-include/ folder and open the version.php.
Find the value for $wp_db_version, and write it down.
Now, open your database, check in the table called wp_options
Find the db_version value:
SELECT option_value FROM yourdatabase.wp_options WHERE option_name = 'db_version';
Those two values must be the same. Change it in the version.php file, not the database.
Source: http://wpquestions.com/question/showChrono/id/4151
Restarting php-fpm service helped me, it clears cache on restart
sudo service php5-fpm restart
Hope that helps some folks out there.
Try clearing your browser cache
The option db_upgraded isn’t getting set by the upgrade process.
Try this: go to /wp-admin/options.php. Fill the field db_upgraded with a 0 (zero). Hit Save Changes.
This is due to a missmatch between the databases versions you said you are using in the settings.
Please follow this steps:
Go to /wp-include/ folder and open the version.php.
Find the value for $wp_db_version, and write it down.
Open your database, check in the table called wp_options
Find the db_version value:
SELECT option_value FROM yourdatabase.wp_options WHERE option_name = 'db_version';
Those two values must be the same. Change it in the version.php file, not the database.

Resources