i have lots of conflictions in my code, but there is no way to click "OK" button

upload.png

Please suggest what should i do now.

Thanks!

2 answers

1 accepted

0 votes
Accepted answer

what about that little X in the top right corner?

this will close the popup.

if pressing Enter does not work as Seth F suggested above, the other option is to commit manually one time . 

select terminal and run..

git add.

git commit -m "initial commit"

let us hope that this window will be scrollable in future version of ST and buttons will be fixed on the bottom.

 

yes it's working with terminal
thanks a lots smile

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

972 views 4 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you