cancel
Showing results for 
Search instead for 
Did you mean: 

Git Switch Branch Issues

SOLVED
Rama16
Contributor

Git Switch Branch Issues

Hi,

 

I am getting below error when I switching the project or opening the project. Initially I manually added projects (composite project) to git. All the projects are opened successfully without git. After I enabled the it works fine, but issue with the local branch. I am on local through git command with no issues and no local commits pendings.

 

When I switch to my local git branch, I have an issue. Please advise.

 

Also, Please confirm if the GIT is 100% integrated with Ready API? 

 

 

 

Error when opening the project : 

There are uncommited changes. Co

 

Error when switching the project :

There are uncommitted changes. Checkout conflict with files:

 

 

Logs : 

 


project.content
reports/settings.xml
settings.xml.
at com.smartbear.readyapi.integrations.vcs.git.GitCommandHelper.checkout(GitCommandHelper.java:532)
at com.smartbear.readyapi.integrations.vcs.git.ReadyApiGitIntegration.switchBranch(ReadyApiGitIntegration.java:248)
at com.eviware.soapui.plugins.vcs.dialogs.VcsBranchSelectionDialog.handleOk(VcsBranchSelectionDialog.java:67)
at com.eviware.soapui.impl.wsdl.actions.project.SimpleDialog$OKAction.actionPerformed(SimpleDialog.java:213)
at javax.swing.AbstractButton.fireActionPerformed(Unknown Source)
at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source)
at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source)
at javax.swing.DefaultButtonModel.setPressed(Unknown Source)
at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source)
at java.awt.Component.processMouseEvent(Unknown Source)
at javax.swing.JComponent.processMouseEvent(Unknown Source)
at java.awt.Component.processEvent(Unknown Source)
at java.awt.Container.processEvent(Unknown Source)
at java.awt.Component.dispatchEventImpl(Unknown Source)
at java.awt.Container.dispatchEventImpl(Unknown Source)
at java.awt.Component.dispatchEvent(Unknown Source)
at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source)
at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source)
at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source)
at java.awt.Container.dispatchEventImpl(Unknown Source)
at java.awt.Window.dispatchEventImpl(Unknown Source)
at java.awt.Component.dispatchEvent(Unknown Source)
at java.awt.EventQueue.dispatchEventImpl(Unknown Source)
at java.awt.EventQueue.access$500(Unknown Source)
at java.awt.EventQueue$3.run(Unknown Source)
at java.awt.EventQueue$3.run(Unknown Source)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.awt.EventQueue$4.run(Unknown Source)
at java.awt.EventQueue$4.run(Unknown Source)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.awt.EventQueue.dispatchEvent(Unknown Source)
at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)
at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)
at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)
at java.awt.WaitDispatchSupport$2.run(Unknown Source)
at java.awt.WaitDispatchSupport$4.run(Unknown Source)
at java.awt.WaitDispatchSupport$4.run(Unknown Source)
at java.security.AccessController.doPrivileged(Native Method)
at java.awt.WaitDispatchSupport.enter(Unknown Source)
at java.awt.Dialog.show(Unknown Source)
at java.awt.Component.show(Unknown Source)
at java.awt.Component.setVisible(Unknown Source)
at java.awt.Window.setVisible(Unknown Source)
at java.awt.Dialog.setVisible(Unknown Source)
at com.eviware.soapui.impl.wsdl.actions.project.SimpleDialog.setVisible(SimpleDialog.java:176)
at com.eviware.soapui.support.UISupport.showDialog(UISupport.java:908)
at com.eviware.soapui.plugins.vcs.actions.SwitchBranchAction.perform(SwitchBranchAction.java:32)
at com.eviware.soapui.plugins.vcs.actions.SwitchBranchAction.perform(SwitchBranchAction.java:1)
at com.eviware.soapui.support.action.swing.SwingActionDelegate.actionPerformed(SwingActionDelegate.java:129)
at javax.swing.AbstractButton.fireActionPerformed(Unknown Source)
at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source)
at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source)
at javax.swing.DefaultButtonModel.setPressed(Unknown Source)
at javax.swing.AbstractButton.doClick(Unknown Source)
at javax.swing.plaf.basic.BasicMenuItemUI.doClick(Unknown Source)
at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(Unknown Source)
at java.awt.Component.processMouseEvent(Unknown Source)
at javax.swing.JComponent.processMouseEvent(Unknown Source)
at java.awt.Component.processEvent(Unknown Source)
at java.awt.Container.processEvent(Unknown Source)
at java.awt.Component.dispatchEventImpl(Unknown Source)
at java.awt.Container.dispatchEventImpl(Unknown Source)
at java.awt.Component.dispatchEvent(Unknown Source)
at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source)
at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source)
at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source)
at java.awt.Container.dispatchEventImpl(Unknown Source)
at java.awt.Window.dispatchEventImpl(Unknown Source)
at java.awt.Component.dispatchEvent(Unknown Source)
at java.awt.EventQueue.dispatchEventImpl(Unknown Source)
at java.awt.EventQueue.access$500(Unknown Source)
at java.awt.EventQueue$3.run(Unknown Source)
at java.awt.EventQueue$3.run(Unknown Source)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.awt.EventQueue$4.run(Unknown Source)
at java.awt.EventQueue$4.run(Unknown Source)
at java.security.AccessController.doPrivileged(Native Method)
at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)
at java.awt.EventQueue.dispatchEvent(Unknown Source)
at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)
at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)
at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)
at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
at java.awt.EventDispatchThread.run(Unknown Source)
Caused by: org.eclipse.jgit.api.errors.CheckoutConflictException: Checkout conflict with files:
Caused by: org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files:
... 90 more

1 ACCEPTED SOLUTION

Accepted Solutions
NBorovykh
Moderator

Re: Git Switch Branch Issues

Hi @Rama16,

 

ReadyAPI is natively integrated with Git: https://support.smartbear.com/readyapi/docs/integrations/git/index.html 

This integration was considerably reworked for v.2.6.0, so if you use an older version please upgrade to v.2.6.0 first.

 

If you're already on v.2.6.0, please submit a support ticket: https://support.smartbear.com/message/?prod=ReadyAPI We'll need to collect some additional info from you to investigate the issue.

 

Natalie
Customer Care Team

Did my reply answer your question? Give Kudos or Accept it as a Solution to help others.↓↓↓↓↓

View solution in original post

1 REPLY 1
NBorovykh
Moderator

Re: Git Switch Branch Issues

Hi @Rama16,

 

ReadyAPI is natively integrated with Git: https://support.smartbear.com/readyapi/docs/integrations/git/index.html 

This integration was considerably reworked for v.2.6.0, so if you use an older version please upgrade to v.2.6.0 first.

 

If you're already on v.2.6.0, please submit a support ticket: https://support.smartbear.com/message/?prod=ReadyAPI We'll need to collect some additional info from you to investigate the issue.

 

Natalie
Customer Care Team

Did my reply answer your question? Give Kudos or Accept it as a Solution to help others.↓↓↓↓↓

View solution in original post

New Here?
Join us and watch the welcome video:
Announcements
Top Kudoed Authors